Sync support from PZP on the PZH

Jira Issue: WP-1034