Update p2p connection negotiation flow, closes #44