Merge "Allow binary value in SettingsProvider" into mnc-dev