Peer connection improvements

Jira Issue: WP-1024