The `main` branch has advanced since `release/v1` was cut; we should merge in those changes as appropriate.