Merge pull request #35 from ssOleg/develop

Fixed ZEN-11294 issue
Merge pull request #158 from ssvsergeyev/develop

Fixed ZEN-11048 issue
Fixes for ZEN-10086, ZEN-10939
Merge remote branch 'vova/develop' into develop