Merge pull request #2364 from TheBlueMatt/2023-06-htlc-preimage-replay