Merge "Wait for the server before validate the rotation result"