Merge pull request #138 from ssvsergeyev/develop

Fixes for 9169, 8975
Updated ZEN-9321 issue
Merge remote branch 'upstream/develop' into develop
Merge pull request #24 from ssOleg/develop

Updated ZEN-9321 issue