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

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