ZEN-12523 fix
Merge pull request #202 from ssvsergeyev/develop

ZEN-12523 fix