Merge "Add hook to allow lazy loading of import sources"