Merge "Allow more characters in subtypes" into main