refs #33872
Merge pull request #626 from aipocom/features/message-shortcut2

refs #33872