Merge branch 'hotfix/template_fix'
added custom attributes to the extension
Merge branch 'hotfix/autocreate_attributes' into develop