Fix for ZEN-11044
Merge pull request #198 from ssvsergeyev/develop

Fix for ZEN-11044
ExtMon build 184
Fixed ZEN-11384
Merge remote branch 'upstream/develop' into develop