Merge "Fix an override filter bug." into oc-dev