Merge pull request #2060 from TheBlueMatt/2023-02-peers-disconnect-consistency