Merge change 21171

* changes:
  Allow max_retires to be set to infinite.