Merge "Refactor installers support code"