Merge "Renamed autofill Field classes." into oc-dev