Improve retry behavior in the face of transient faliures
Improve retry behavior in the face of transient faliures