PZH - PZH certificate exchange improvements

Jira Issue: WP-955