Merge "Add system wide management of core settings"