Wp 1034 pzp pzh sync

Bug fixes