Merge "Fix edge cases leading to backup hanging forever"