Merge "Let the absence of subtype.xml mean there is no additional subtype"