Fix for ZEN-15396 issue
Merge remote branch 'upstream/develop' into develop
Merge pull request #35 from ssOleg/develop

Fix for ZEN-15396 issue