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

Fix for ZEN-15606