Apply post-1.22.0 patches, bump version to 1.22.1