Merge pull request #194 from ssamartyn/develop

Fixed ZEN-10586
Fixed ZEN-12386
Merge remote branch 'upstream/develop' into develop