Merge "Added GlobalSettingsToPropertiesMapper"