Tweak messages
Merge branch 'bugid-93889' into dev