Merge "Wait for server to be active before deleting"