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

Fix for ZEN-10265