fixing bugs in ic_importer
Merge remote-tracking branch 'origin/master@OME'
Merge remote-tracking branch 'origin/master' into master@OME