Fixed bug ZEN-9844
Merge remote branch 'vova/develop' into develop
Merge pull request #45 from ssirushchyshyn/develop

Fixes for ZEN-9842 and ZEN-9839
Merge pull request #46 from ssOleg/develop

Fixed bug ZEN-9844
Fixes: ZEN-9846, ZEN-9886
Merge remote-tracking branch 'upstream/develop' into develop