Fix missing use statement for previous commit
Merge remote-tracking branch 'origin/new_templates'