Merge pull request #15500 from eileenmcnaughton/part_cleanup