Merge "Take new autofill structure for each partition" into oc-dev