Merge "ensure we wait for server deletes"