Merge "RCFilters: hygiene"