Merge pull request #1844 from valentinewallace/2022-11-htlc-interception-refactor...