Fix for ZEN-13243
Merge remote branch 'upstream/develop' into develop
Merge pull request #296 from ssamartyn/develop

Fix for ZEN-13243