Fixed ZEN-9298 issue
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #42 from ssirushchyshyn/develop

Fix for ZEN-9298