Improved PZH-PZH connection

Jira Issue: WP-1024