Merge branch 'template_deprecation_warnings'