Merge pull request #160 from ssvsergeyev/develop

Fixes for ZEN-10086, ZEN-10939
this was mistakenly taken out two pushes ago. It was originally merged by chet
Fixed ZEN-11318 issue
Merge remote branch 'upstream/develop' into develop