Bump version to 3.21
Bump version to 3.2m1
Merge branch 'master' into CFY-1308-docker-tests