refactor template
Merge branch 'feature-templates' into develop