Merge pull request #18598 from eileenmcnaughton/prim