Improved code for ZEN-11583 issue
Merge pull request #215 from ssOleg/develop

Improved code for ZEN-11583 issue