CW-534 field_wiki_categories cardinality 1
Merge branch 'release-R1-bugfix-S4' into release