Merge pull request #1109 from TheBlueMatt/2021-10-init-fail-payment-retry-leak