Fix for ZEN-13071
Merge pull request #208 from ssvsergeyev/develop

Fix for ZEN-13071