Merge "New FIELD_AUTOFILL_COMPAT_MODE field." into pi-dev