Update schemaPlugins
Update schemaPlugins
Remove topicCategory handler from custom-fields
Use the right label for enumerations
Update schemaPlugins
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x