Merge pull request #1202 from TheBlueMatt/2021-12-fix-retries-races