P2P fixes

Merged Mariusz Trela requested to merge mt-p2p-fix into develop

Merge request reports