Merge pull request #8689 from BKPepe/jinja