Merge "Allow refinement of more non-filter-equals fields." into udc-dev