WP-2572 updated importer