Merge branch qa, module version update