Merge "GlobalSettingsToPropertiesMapper refactor"