Merge branch 'install-fixes' into develop