automerge: ed1e999 * commit 'ed1e999cb71f3af51ee96a6ed8ac3f3b031e1968': Eliminate race condition around backup completion + resumption
automerge: ed1e999 * commit 'ed1e999cb71f3af51ee96a6ed8ac3f3b031e1968': Eliminate race condition around backup completion + resumption