*edit: Set version number to 1.21.1
Merge branch 'release-1.21' into develop