Fix problem with templates
Merge branch 'feature/template' into devel