Merge "Fix incompatibilities with Protobuf 22.x." into main