Tweak message
Merge branch 'CE-472' into dev