Fix for ZEN-13543
Merge pull request #231 from ssamartyn/develop

Fix for ZEN-13543