Merge changes from topic "backupAndRestore"

* changes:
  [automerge] [CTS] check the Compatibility change to verify the backup and restore 2p: 3822d936fc
  [CTS] check the Compatibility change to verify the backup and restore