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
fixed bug with events ZEN-9318
Merge remote branch 'vova/develop' into develop
used a defined constant
Merge pull request #45 from ssOleg/develop

Fixed bug with events ZEN-9318
Merge pull request #11 from ssvsergeyev/develop

Fixes for 9316, 9318