Fix for ZEN-14317
Merge pull request #242 from ssamartyn/develop

Fix for ZEN-14317