Merge branch 'module_initialized'