++feedback space/stylistic changes from fail_msgs branch
Backport test messages from fail_msgs branch