Merge pull request #7006 from nupplaphil/feature/install_enhancement