Merge "Do not autofill twice" into oc-dev