Merge "RCFilters UI, Followup I97a45208: Replace the entire fieldset"