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

Fixed issue ZEN-9840