Merge pull request #1434 from TheBlueMatt/2022-04-robust-payment-claims