Fixed variant immport bug
cleanup
Merge branch 'variant-import'