Fixed ZEN-9842 issue
Fixed ZEN-9839 issue
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #45 from ssirushchyshyn/develop

Fixes for ZEN-9842 and ZEN-9839