Fixed ZEN-11585 issue
Corrected ZEN-11585 issue
Merge pull request #181 from ssOleg/develop

Fixed ZEN-11585 issue