Merge branch 'release/6.2' into develop
Merge branch 'master' into develop

* master:
  Use latest tag as a version base