Improve message for ZEN-13243
Merge pull request #294 from ssamartyn/develop

Improve message for ZEN-13243