Merge "Make BackupDumper MCR compatible (main slot only)"