Merge pull request #42 from ssirushchyshyn/develop

Fix for ZEN-9298
Fix for ZEN-9319
Merge remote-tracking branch 'upstream/develop' into develop