Merge "Backup all backupable settings" into oc-mr1-dev