Merge installer changes