Merge branch 'master' into add_template_corrections