Merge pull request #52 from ssamartyn/develop

Fixed ZEN-9835
Fixed issue ZEN-9840
Merge remote branch 'vova/develop' into develop
Merge pull request #53 from ssOleg/develop

Fixed issue ZEN-9840
UI fix
Merge pull request #54 from ssirushchyshyn/develop

Small UI fix
Fixed ZEN-9835
Merge remote branch 'upstream/develop' into develop