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

Fix for ZEN-15112