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

Fix for ZEN-11098