Merge pull request #41 from ssirushchyshyn/develop

Fix for ZEN-9282
Fixed ZEN-9298 issue
Merge remote-tracking branch 'upstream/develop' into develop