cherry-pick 503 retry