Merge "Backup and restore user disabling the NAS" into main