Merge branch '74_optional_import_fields' close #74