Merge pull request #1 from ssOleg/develop

Fixed ZEN-9312 issue
Merge pull request #2 from ssOleg/develop

Merge fix
Fixed ZEN-8583 issue
Merge remote branch 'vova/develop' into develop