* changes: [automerger skipped] Handle num fields that aren't one. skipped: 95508792 Handle num fields that aren't one.