Merge change 9608

* changes:
  Add configurable data-retry.