Merge "Remove <imi> entries with zero <subtype> from subtype.xml"