Merge pull request #15740 from eileenmcnaughton/partial