Merge "Handle retry count correctly"