merge pull: importer improvements