Merge "Preserve retryCount when retrying." into jb-dev