Merge from subtype branch.