Updated ZEN-9211 issue
Merge remote branch 'upstream/develop' into develop
Merge pull request #21 from ssOleg/develop

Updated ZEN-9211 issue