Revert "Revert "merge all module version 1""

This reverts commit 6344501e9f5770f1459c367f0e96b31982cad349.