Update 21.txt with generics to field types. automerge: 38d5bad
automerge: e83af31

* commit 'e83af31d0a3f720eff91900bd7b5812a3e59932f':
  Update 21.txt with generics to field types.