Merge "Fix contradictory RC filters and add back-compat"