Merged with fix_import_node
Resolve merge conflicts