Update to v0.22.1