Merge pull request #152 from ssvsergeyev/develop

Fixes for 11058, 11041, 10088
Merge pull request #153 from ssvsergeyev/develop

Fix for ZEN-11098
Merge pull request #154 from ssvsergeyev/develop

Fix for ZEN-11045: added workaround for 2003 / xp