Merged importer to mainline.