Merge the PZH and PZHWS

This PR merges the PZH and the PZHWS.

Jira issue: WP-1116