Merge pull request #22175 from eileenmcnaughton/smarty3