Merge pull request #1815 from TheBlueMatt/2022-10-dead-gossip-code