Bugfix: track retry number

Merged Theodore Chang requested to merge 852-track-retry into v1.0.9

Closes #852 (closed)

Merge request reports