Merge pull request #2791 from valentinewallace/2023-12-multihop-recv-followups