Merge "Fix bad instruction massaging"