Corrected changelog
Bumped versions
Merge branch 'release/2.21.0' into develop
Bumped versions