Merge "fix post-install.sh"