Merge branch 'feat/templates' into 'develop'