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

Fixed ZEN-11384