Merge "RCFilters: Don't allow underscore in filter or group names"