Merge "SettingsProvider enhanced cache" into udc-dev