Merge pull request #2795 from TheBlueMatt/2023-11-robuster-chan-to-peer