Merge "Always wait on server delete"