Merge pull request #182 from ssOleg/develop

Fixed ZEN-11583 issue
Fixed ZEN-11591 issue
Merge remote branch 'upstream/develop' into develop