Merge branch develop, module version update
Merge branch qa, module version update
Merge branch 'master' into develop