Merge "Removed deprecated auto(F)ill classes." into oc-dev