Merge pull request #1600 from TheBlueMatt/2022-07-explicit-avoid-retries