Update version to v1.21
Merge branch 'master' into live-docker