[DO NOT MERGE} - Installer fixes master