Merge "Update the backup and restore to correct namespace" into main