Fixed ZEN-9835
Merge remote branch 'upstream/develop' into develop
Merge pull request #55 from ssamartyn/develop

Fixed ZEN-9835
Merge pull request #14 from ssvsergeyev/develop

Fix for ZEN-9835