import lines types
Merge branch '0006-import-lines' into develop