Merge "RCFilters: Fix validation for single_option groups"