Merge branch 'master' into release

diff --combined version
index 759e855fb6641aea516e8620867cfa4cb9738d92,648d222611c66aceafe93f87d4732cab0b0ae249..4f279437137448237828f67f68d13dcda20891b0
--- 1/version
--- 2/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.21.0
 -v0.22-dev
++v0.22.0