Merge "Change reference to Bundle.filterValues"