Follow new installer
Merge branch 'refs/heads/installer'