Merge branch 'templates-definition' into polyconseil