Fix for ZEN-11044
Merge pull request #198 from ssvsergeyev/develop

Fix for ZEN-11044