Apply post-1.20.0 patches, bump version to 1.20.1