Pzh-Pzh connection optimization

Jirs Issue: WP-1024