Fixed ZEN-10165 issue
Merge pull request #56 from ssOleg/develop

Fixed ZEN-10165 issue