Merge pull request #22195 from eileenmcnaughton/smarty20