Merge pull request #1382 from TheBlueMatt/2022-03-gossip-queries-sucks