Merge "Fix BackupRestoreTest" into sc-dev