Merge "Make autofilled highlight an attribute" into oc-dev