Merge pull request #1053 from valentinewallace/2021-08-dedup-payment-sent