Merge tag '2.0.1' into develop

Edit manifest

* tag '2.0.1':
edit version
remove alert
Merge branch 'release/2.0.2'

* release/2.0.2:
  remove alert
  edit version