Merge pull request #1916 from valentinewallace/2022-11-chanman-payment-retries