Bumped version number to 21.1
Merge branch 'release-v21.1' into develop