Merge pull request #16293 from eileenmcnaughton/part_search