Merge "Performance fix for multiple language subtypes"