Update importlib to reflect recent changes
#6557
Merged
importlib to reflect recent changes
#6557