Merge pull request #200 from ssamartyn/develop

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