Fix for ZEN-15433
Merge pull request #280 from ssamartyn/develop

Fix for ZEN-15433