Fixed global_defaults_to_system_settings
Merge pull request #1678 from anandpdoshi/hotfix

Fixed global_defaults_to_system_settings