Improvements to AbstractField
Fix country FT
Merge pull request #3075 from obrignoni/2.3/patch-choice

2.3/patch choice