Merge pull request #3098 from arik-so/arik/gossip-v2-parsing