Merge branch 'release/2.1.0' into develop

* release/2.1.0:
  Bump version for release
Update comment
Disable on admin
Bump version number and update filesums
Merge branch 'release/2.2.0'

* release/2.2.0:
  Bump version number and update filesums
  Disable on admin
  Update comment