Merge pull request #23 from ssOleg/develop

Fixed ZEN-14084 issue