Fixes for ZEN-10086, ZEN-10939
Fixes for ZEN-10939
Merge pull request #160 from ssvsergeyev/develop

Fixes for ZEN-10086, ZEN-10939