Merge pull request #1702 from TheBlueMatt/2022-09-one-hop-retryable