Merge pull request #43 from ssirushchyshyn/develop

Fix for ZEN-9297 issue
Fixed ZEN-9316 issue
Updated unit tests
Merge remote-tracking branch 'upstream/develop' into develop