Fixed ZEN-14356 issue
Merge remote branch 'upstream/develop' into develop
Merge pull request #20 from ssOleg/develop

Fixed ZEN-14356 issue