Update to build installer
Merge branch 'hotfix/InstallerBuildUpdate'