Merge branch origin/develop, module version update
Merge branch origin/qa, module version update