Fixed code generation of import.
Merging changes.