Merge branch master, module version update
Update version module-core
Update version module-core
Merge branch develop, module version update