Merge remote-tracking branch 'origin/controller/sharon' into logic/wenhao
Fix FIELD_COUNT
Merge remote-tracking branch 'origin/logic/wenhao'