Merge "Add verification when restoring backups"