Wait for module initialization.
Merge branch 'wait-for-module-init' into develop