Merge "New flow for Settings.Global" into main