Merge pull request #22547 from eileenmcnaughton/smart