Merge "Fix setAdditionalSubtypes"