Bumped version/changelog
Merge branch 'release/3.1.21' into develop