Merge branch origin/qa, module version update