Merge pull request #22179 from eileenmcnaughton/smarty6