backups: Various fixes
This MR is done on top of !2586 (closed) for convenience of testing but can be merged independently by cherry picking.
This MR is done on top of !2586 (closed) for convenience of testing but can be merged independently by cherry picking.