Fix for ZEn-15044
Merge pull request #246 from ssvsergeyev/develop

Fix for ZEn-15044