Merge pull request #23404 from colemanw/getFieldsFilters