Fix for ZEN-13546
Merge remote branch 'upstream/develop' into develop
Improved code for ZEN-13546
Merge remote branch 'upstream/develop' into develop
Merge pull request #275 from ssamartyn/develop

Fix for ZEN-13546