Merge "Fix bug in abort message processing."