Merge "P2p fixes" into jb-dev