Merge branch 'release/6.2'
Use latest tag as a version base
Merge branch 'master' into develop

* master:
  Use latest tag as a version base