Merge pull request #8 from ssOleg/develop

Fixed ZEN-14084 issue