Merge "install-multi-package fix"