Bumped version number to 21.0
Merge branch 'release-v21.0' into develop