Bump version to v1.21
Update changelog
Merge branch 'release/1.21' into develop

* release/1.21:
  Update changelog
  Bump version to v1.21