Merge pull request #13409 from carlyin0801/issue_13407_retry_cancel_fix