Merged subtype branch to new head.