Merge "Decouple Backup / Restore Error Codes" into main