Merge pull request #2663 from TheBlueMatt/2023-10-peer-race-send-discon