Use top-level keyword
fields instead of subfields
#3161
Merged
keyword
fields instead of subfields
#3161