Merge "Backup and restore scenario"