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

Fixed ZEN-11419 issue
Merge pull request #169 from ssbunyk/develop

Fix for ZEN-11419