Merge pull request #1771 from anandpdoshi/hotfix

Fix in HR patch
Also save Global Defaults in System Settings patch