Merge pull request #198 from ssvsergeyev/develop

Fix for ZEN-11044
ExtMon build 184
Fixed ZEN-11384
Changes to code for defect ZEN-11384
Merge pull request #199 from ssamartyn/develop

Fixed ZEN-11384
Fixes for ZEN-12386
Merge remote branch 'upstream/develop' into develop
Merge pull request #200 from ssamartyn/develop

Fixes for ZEN-12386
Fixes for ZEN-12571
Merge remote branch 'upstream/develop' into develop
Merge pull request #201 from ssamartyn/develop

Fixes for ZEN-12571
UCS-specific changes
Drop unneeded files