Tweak messages
Merge branch 'bugid-98710' into dev