Merge pull request #10 from ssOleg/develop

Fixed ZEN-9194 issue