fix 32: new "builtin" argument in import_template
Merge branch 'fix32' into dev