Merge pull request #199 from ssamartyn/develop

Fixed ZEN-11384
Fixes for ZEN-12386
Merge remote branch 'upstream/develop' into develop