Merge branch 'release/2.0' into develop
Renamed alias
Merge branch 'develop'

* develop:
  Renamed alias