Fixed ZEN-10863 issue
Merge pull request #27 from ssOleg/develop

Fixed ZEN-10863 issue