templates v1
Merge branch 'templates'