Reverted Back to working build, pre merge. Backup
Fixed a bug in MasterBackup