refs #7400. Apply simple fix.
Merge branch 'feature/7400_remove_message' into develop