Merge pull request #16546 from eileenmcnaughton/part_end2