Merge pull request #69 from ssbunyk/develop

Fix ZEN-10187
Merge pull request #70 from ssbunyk/develop

Fix ZEN-10367
change event keys for instance state events
Merge remote branch 'vova/develop' into develop