Merge pull request #2008 from valentinewallace/2023-02-remove-manual-retries