Merge branch origin/qa, module version update
Update version module-core
Merge branch origin/develop, module version update