Fixed ZEN-9316 issue
Updated unit tests
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #44 from ssirushchyshyn/develop

Fix for ZEN-9316 issue