Fix for ZEN-13580
Merge pull request #233 from ssamartyn/develop

Fix for ZEN-13580