Merge pull request #233 from ssamartyn/develop

Fix for ZEN-13580
Fix for ZEN-13539
Merge remote branch 'upstream/develop' into develop