Add: use field types to select the right templates (in the list and show builders)
Merge branch 'dev-type-templates' into develop