Updated templates
Merge branch 'master' into feature/updated-templates
Merge branch 'feature/updated-templates'