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