Merge pull request #1840 from valentinewallace/2022-11-htlc-intercept-prefactor