Merge pull request #19 from ssOleg/develop

Fixed ZEN-15127 issue
Fixed ZEN-14356 issue
Merge remote branch 'upstream/develop' into develop