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

Fixed ZEN-9211 issue