Merge pull request #23954 from eileenmcnaughton/poly