Merge "Remove temporary rcfilters variables"