WIP
Merge branch 'template_management' into xls_management