Merge pull request #22181 from eileenmcnaughton/smarty8