Merge "Fix p2p service discovery" into jb-dev