Merge "Add flag for Backup and restore permissions" into main