PZP complete issue
Jira Issue: WP-794