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

Fixed ZEN-8583 issue