Merge pull request #37 from ssbunyk/develop

Fix for ZEN-10939
ZEN-10251 fix message
Fixed ZEN-11416 issue
Merge remote branch 'upstream/develop' into develop
Merge remote branch 'vova/develop' into develop
Merge pull request #1 from ssOleg/develop

Fixed ZEN-11416 issue
Merge pull request #167 from ssbunyk/develop

Fixes for  ZEN-11416, ZEN-10251