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