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

Fix for ZEN-15240