Merge p2p encryption changes in master

Merge request reports