Merge "Enable credential manager for backup/restore" into main