Update version
Merge branch 'master' into develop
Update version module2
Update version module2 0.20.0
Update version module2 0.21.0
Update version module-core 0.21.0
Merge branch origin/develop, module version update
Merge branch origin/qa, module version update