Newly created modules should be loaded
Merge remote-tracking branch 'upstream/refactor' into refactor