Sync bug fixing

Jira Issue: WP-1034
Merge branch 'WP-1034-PZP-PZH-Sync' of https://github.com/habibvirji/webinos-pzp into WP-1034-PZP-PZH-Sync