refs #33625
Merge pull request #550 from aipocom/features/message2

refs #33625