Merge pull request #1159 from jkczyz/2021-11-network-gossip