Merge "RCFilters: Remove getValue and use FormOptions"