[3.8] Add better HTTP 503 support