Fixed ZEN-11294 issue
Merge remote branch 'vova/develop' into develop
Merge pull request #35 from ssOleg/develop

Fixed ZEN-11294 issue