Merge "Ensure that the first post-restore backup pass is correct"