Merged trunk and subtype.