Cherry pick backup manager additions