Merge pull request #2248 from TheBlueMatt/2023-04-gossip-check