Merge "Take snapshots of SettingBase subclasses" into sc-dev