Merge "Do not retry immediately after server fault"