Improved messages, refs #20193
Merge remote-tracking branch 'collective/master'