Merge "Copy the retry split from master to oc-dev" into oc-dev