Merge pull request #1618 from wpaulino/gossip-sync-constructors