Merge "Check for right-* messages as a structure test"