PZP callback handling modified

Jira Issue: WP-795