diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6a65249840e..3f0a2d0d6cd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -269,12 +269,14 @@ All wire protocol changes that may concern rolling upgrades should be documented Pekko includes a shaded version of protobuf `3` that is used for internal communication. To generate files, run `protobufGenerate`. The generated files are put in each project's `src/main/java` and need to be committed. -The generated files are automatically transformed to use the shaded version of protobuf. +The generated files are automatically transformed to use the shaded version of protobuf and add copyright headers. -Generation depends on protoc `3.11.4` being on the path. See [protobuf project](https://github.com/protocolbuffers/protobuf#protocol-compiler-installation) for installation instructions, and +Generation depends on the protoc version specified in `project/Dependencies.scala` being on the path. See [protobuf project](https://github.com/protocolbuffers/protobuf#protocol-compiler-installation) for installation instructions, and [Protobuf.scala](https://github.com/apache/pekko/blob/main/project/Protobuf.scala) for details of how to override the settings for generation. +After generation, run `sbt javafmt Test/javafmt`. + ### Pull request requirements For a pull request to be considered at all, it has to meet these requirements: diff --git a/build.sbt b/build.sbt index f3ba8323e19..8826338e610 100644 --- a/build.sbt +++ b/build.sbt @@ -240,6 +240,7 @@ lazy val docs = pekkoModule("docs") .settings(Dependencies.docs) .settings(PekkoDisciplinePlugin.docs) .settings(Paradox.settings) + .settings(Protobuf.settings) .settings(javacOptions += "-parameters") // for Jackson .enablePlugins( ParadoxPlugin, diff --git a/cluster-metrics/src/main/java/org/apache/pekko/cluster/metrics/protobuf/msg/ClusterMetricsMessages.java b/cluster-metrics/src/main/java/org/apache/pekko/cluster/metrics/protobuf/msg/ClusterMetricsMessages.java index 95a3f9e82f1..190d7b73e79 100644 --- a/cluster-metrics/src/main/java/org/apache/pekko/cluster/metrics/protobuf/msg/ClusterMetricsMessages.java +++ b/cluster-metrics/src/main/java/org/apache/pekko/cluster/metrics/protobuf/msg/ClusterMetricsMessages.java @@ -8,12 +8,13 @@ */ /* - * Copyright (C) 2020-2022 Lightbend Inc. + * Copyright (C) 2019-2022 Lightbend Inc. */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: ClusterMetricsMessages.proto +// Protobuf Java Version: 3.25.6 package org.apache.pekko.cluster.metrics.protobuf.msg; public final class ClusterMetricsMessages { @@ -80,7 +81,7 @@ public interface MetricsGossipEnvelopeOrBuilder extends * * Protobuf type {@code MetricsGossipEnvelope} */ - public static final class MetricsGossipEnvelope extends + public static final class MetricsGossipEnvelope extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:MetricsGossipEnvelope) MetricsGossipEnvelopeOrBuilder { @@ -99,80 +100,6 @@ protected java.lang.Object newInstance( return new MetricsGossipEnvelope(); } - @java.lang.Override - public final org.apache.pekko.protobufv3.internal.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private MetricsGossipEnvelope( - org.apache.pekko.protobufv3.internal.CodedInputStream input, - org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) - throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields = - org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) != 0)) { - subBuilder = from_.toBuilder(); - } - from_ = input.readMessage(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(from_); - from_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - case 18: { - org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) != 0)) { - subBuilder = gossip_.toBuilder(); - } - gossip_ = input.readMessage(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(gossip_); - gossip_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000002; - break; - } - case 24: { - bitField0_ |= 0x00000004; - reply_ = input.readBool(); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor() { return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossipEnvelope_descriptor; @@ -193,6 +120,7 @@ private MetricsGossipEnvelope( * required .Address from = 1; * @return Whether the from field is set. */ + @java.lang.Override public boolean hasFrom() { return ((bitField0_ & 0x00000001) != 0); } @@ -200,12 +128,14 @@ public boolean hasFrom() { * required .Address from = 1; * @return The from. */ + @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address getFrom() { return from_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance() : from_; } /** * required .Address from = 1; */ + @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder getFromOrBuilder() { return from_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance() : from_; } @@ -216,6 +146,7 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Addr * required .MetricsGossip gossip = 2; * @return Whether the gossip field is set. */ + @java.lang.Override public boolean hasGossip() { return ((bitField0_ & 0x00000002) != 0); } @@ -223,22 +154,25 @@ public boolean hasGossip() { * required .MetricsGossip gossip = 2; * @return The gossip. */ + @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip getGossip() { return gossip_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.getDefaultInstance() : gossip_; } /** * required .MetricsGossip gossip = 2; */ + @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipOrBuilder getGossipOrBuilder() { return gossip_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.getDefaultInstance() : gossip_; } public static final int REPLY_FIELD_NUMBER = 3; - private boolean reply_; + private boolean reply_ = false; /** * required bool reply = 3; * @return Whether the reply field is set. */ + @java.lang.Override public boolean hasReply() { return ((bitField0_ & 0x00000004) != 0); } @@ -246,6 +180,7 @@ public boolean hasReply() { * required bool reply = 3; * @return The reply. */ + @java.lang.Override public boolean getReply() { return reply_; } @@ -293,7 +228,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu if (((bitField0_ & 0x00000004) != 0)) { output.writeBool(3, reply_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -314,7 +249,7 @@ public int getSerializedSize() { size += org.apache.pekko.protobufv3.internal.CodedOutputStream .computeBoolSize(3, reply_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -344,7 +279,7 @@ public boolean equals(final java.lang.Object obj) { if (getReply() != other.getReply()) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -368,7 +303,7 @@ public int hashCode() { hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean( getReply()); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -417,11 +352,13 @@ public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessag return org.apache.pekko.protobufv3.internal.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } + public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return org.apache.pekko.protobufv3.internal.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } + public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseDelimitedFrom( java.io.InputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) @@ -508,20 +445,18 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - if (fromBuilder_ == null) { - from_ = null; - } else { - fromBuilder_.clear(); + bitField0_ = 0; + from_ = null; + if (fromBuilder_ != null) { + fromBuilder_.dispose(); + fromBuilder_ = null; } - bitField0_ = (bitField0_ & ~0x00000001); - if (gossipBuilder_ == null) { - gossip_ = null; - } else { - gossipBuilder_.clear(); + gossip_ = null; + if (gossipBuilder_ != null) { + gossipBuilder_.dispose(); + gossipBuilder_ = null; } - bitField0_ = (bitField0_ & ~0x00000002); reply_ = false; - bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -548,31 +483,31 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Metr @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope buildPartial() { org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope result = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { - if (fromBuilder_ == null) { - result.from_ = from_; - } else { - result.from_ = fromBuilder_.build(); - } + result.from_ = fromBuilder_ == null + ? from_ + : fromBuilder_.build(); to_bitField0_ |= 0x00000001; } if (((from_bitField0_ & 0x00000002) != 0)) { - if (gossipBuilder_ == null) { - result.gossip_ = gossip_; - } else { - result.gossip_ = gossipBuilder_.build(); - } + result.gossip_ = gossipBuilder_ == null + ? gossip_ + : gossipBuilder_.build(); to_bitField0_ |= 0x00000002; } if (((from_bitField0_ & 0x00000004) != 0)) { result.reply_ = reply_; to_bitField0_ |= 0x00000004; } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -628,7 +563,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMe if (other.hasReply()) { setReply(other.getReply()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -658,17 +593,49 @@ public Builder mergeFrom( org.apache.pekko.protobufv3.internal.CodedInputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + input.readMessage( + getFromFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + input.readMessage( + getGossipFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 24: { + reply_ = input.readBool(); + bitField0_ |= 0x00000004; + break; + } // case 24 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { - parsedMessage = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -703,11 +670,11 @@ public Builder setFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetr throw new NullPointerException(); } from_ = value; - onChanged(); } else { fromBuilder_.setMessage(value); } bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -717,11 +684,11 @@ public Builder setFrom( org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder builderForValue) { if (fromBuilder_ == null) { from_ = builderForValue.build(); - onChanged(); } else { fromBuilder_.setMessage(builderForValue.build()); } bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -730,31 +697,32 @@ public Builder setFrom( public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address value) { if (fromBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0) && - from_ != null && - from_ != org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance()) { - from_ = - org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.newBuilder(from_).mergeFrom(value).buildPartial(); + from_ != null && + from_ != org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance()) { + getFromBuilder().mergeFrom(value); } else { from_ = value; } - onChanged(); } else { fromBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000001; + if (from_ != null) { + bitField0_ |= 0x00000001; + onChanged(); + } return this; } /** * required .Address from = 1; */ public Builder clearFrom() { - if (fromBuilder_ == null) { - from_ = null; - onChanged(); - } else { - fromBuilder_.clear(); - } bitField0_ = (bitField0_ & ~0x00000001); + from_ = null; + if (fromBuilder_ != null) { + fromBuilder_.dispose(); + fromBuilder_ = null; + } + onChanged(); return this; } /** @@ -823,11 +791,11 @@ public Builder setGossip(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMe throw new NullPointerException(); } gossip_ = value; - onChanged(); } else { gossipBuilder_.setMessage(value); } bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -837,11 +805,11 @@ public Builder setGossip( org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.Builder builderForValue) { if (gossipBuilder_ == null) { gossip_ = builderForValue.build(); - onChanged(); } else { gossipBuilder_.setMessage(builderForValue.build()); } bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -850,31 +818,32 @@ public Builder setGossip( public Builder mergeGossip(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip value) { if (gossipBuilder_ == null) { if (((bitField0_ & 0x00000002) != 0) && - gossip_ != null && - gossip_ != org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.getDefaultInstance()) { - gossip_ = - org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.newBuilder(gossip_).mergeFrom(value).buildPartial(); + gossip_ != null && + gossip_ != org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.getDefaultInstance()) { + getGossipBuilder().mergeFrom(value); } else { gossip_ = value; } - onChanged(); } else { gossipBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000002; + if (gossip_ != null) { + bitField0_ |= 0x00000002; + onChanged(); + } return this; } /** * required .MetricsGossip gossip = 2; */ public Builder clearGossip() { - if (gossipBuilder_ == null) { - gossip_ = null; - onChanged(); - } else { - gossipBuilder_.clear(); - } bitField0_ = (bitField0_ & ~0x00000002); + gossip_ = null; + if (gossipBuilder_ != null) { + gossipBuilder_.dispose(); + gossipBuilder_ = null; + } + onChanged(); return this; } /** @@ -918,6 +887,7 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Metr * required bool reply = 3; * @return Whether the reply field is set. */ + @java.lang.Override public boolean hasReply() { return ((bitField0_ & 0x00000004) != 0); } @@ -925,6 +895,7 @@ public boolean hasReply() { * required bool reply = 3; * @return The reply. */ + @java.lang.Override public boolean getReply() { return reply_; } @@ -934,8 +905,9 @@ public boolean getReply() { * @return This builder for chaining. */ public Builder setReply(boolean value) { - bitField0_ |= 0x00000004; + reply_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -982,7 +954,18 @@ public MetricsGossipEnvelope parsePartialFrom( org.apache.pekko.protobufv3.internal.CodedInputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException { - return new MetricsGossipEnvelope(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -1087,7 +1070,7 @@ org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics * * Protobuf type {@code MetricsGossip} */ - public static final class MetricsGossip extends + public static final class MetricsGossip extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:MetricsGossip) MetricsGossipOrBuilder { @@ -1098,7 +1081,8 @@ private MetricsGossip(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Bu } private MetricsGossip() { allAddresses_ = java.util.Collections.emptyList(); - allMetricNames_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList(); + allMetricNames_ = + org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList(); nodeMetrics_ = java.util.Collections.emptyList(); } @@ -1109,85 +1093,6 @@ protected java.lang.Object newInstance( return new MetricsGossip(); } - @java.lang.Override - public final org.apache.pekko.protobufv3.internal.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private MetricsGossip( - org.apache.pekko.protobufv3.internal.CodedInputStream input, - org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) - throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields = - org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - allAddresses_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - allAddresses_.add( - input.readMessage(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.PARSER, extensionRegistry)); - break; - } - case 18: { - org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes(); - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - allMetricNames_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000002; - } - allMetricNames_.add(bs); - break; - } - case 26: { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - nodeMetrics_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - nodeMetrics_.add( - input.readMessage(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.PARSER, extensionRegistry)); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - allAddresses_ = java.util.Collections.unmodifiableList(allAddresses_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - allMetricNames_ = allMetricNames_.getUnmodifiableView(); - } - if (((mutable_bitField0_ & 0x00000004) != 0)) { - nodeMetrics_ = java.util.Collections.unmodifiableList(nodeMetrics_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor() { return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossip_descriptor; @@ -1202,16 +1107,19 @@ private MetricsGossip( } public static final int ALLADDRESSES_FIELD_NUMBER = 1; + @SuppressWarnings("serial") private java.util.List allAddresses_; /** * repeated .Address allAddresses = 1; */ + @java.lang.Override public java.util.List getAllAddressesList() { return allAddresses_; } /** * repeated .Address allAddresses = 1; */ + @java.lang.Override public java.util.List getAllAddressesOrBuilderList() { return allAddresses_; @@ -1219,25 +1127,30 @@ public java.util.Listrepeated .Address allAddresses = 1; */ + @java.lang.Override public int getAllAddressesCount() { return allAddresses_.size(); } /** * repeated .Address allAddresses = 1; */ + @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address getAllAddresses(int index) { return allAddresses_.get(index); } /** * repeated .Address allAddresses = 1; */ + @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder getAllAddressesOrBuilder( int index) { return allAddresses_.get(index); } public static final int ALLMETRICNAMES_FIELD_NUMBER = 2; - private org.apache.pekko.protobufv3.internal.LazyStringList allMetricNames_; + @SuppressWarnings("serial") + private org.apache.pekko.protobufv3.internal.LazyStringArrayList allMetricNames_ = + org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList(); /** * repeated string allMetricNames = 2; * @return A list containing the allMetricNames. @@ -1272,16 +1185,19 @@ public java.lang.String getAllMetricNames(int index) { } public static final int NODEMETRICS_FIELD_NUMBER = 3; + @SuppressWarnings("serial") private java.util.List nodeMetrics_; /** * repeated .NodeMetrics nodeMetrics = 3; */ + @java.lang.Override public java.util.List getNodeMetricsList() { return nodeMetrics_; } /** * repeated .NodeMetrics nodeMetrics = 3; */ + @java.lang.Override public java.util.List getNodeMetricsOrBuilderList() { return nodeMetrics_; @@ -1289,18 +1205,21 @@ public java.util.Listrepeated .NodeMetrics nodeMetrics = 3; */ + @java.lang.Override public int getNodeMetricsCount() { return nodeMetrics_.size(); } /** * repeated .NodeMetrics nodeMetrics = 3; */ + @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics getNodeMetrics(int index) { return nodeMetrics_.get(index); } /** * repeated .NodeMetrics nodeMetrics = 3; */ + @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetricsOrBuilder getNodeMetricsOrBuilder( int index) { return nodeMetrics_.get(index); @@ -1341,7 +1260,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu for (int i = 0; i < nodeMetrics_.size(); i++) { output.writeMessage(3, nodeMetrics_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1366,7 +1285,7 @@ public int getSerializedSize() { size += org.apache.pekko.protobufv3.internal.CodedOutputStream .computeMessageSize(3, nodeMetrics_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1387,7 +1306,7 @@ public boolean equals(final java.lang.Object obj) { .equals(other.getAllMetricNamesList())) return false; if (!getNodeMetricsList() .equals(other.getNodeMetricsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1410,7 +1329,7 @@ public int hashCode() { hash = (37 * hash) + NODEMETRICS_FIELD_NUMBER; hash = (53 * hash) + getNodeMetricsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1459,11 +1378,13 @@ public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessag return org.apache.pekko.protobufv3.internal.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } + public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return org.apache.pekko.protobufv3.internal.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } + public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseDelimitedFrom( java.io.InputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) @@ -1532,38 +1453,34 @@ public static final class Builder extends // Construct using org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - getAllAddressesFieldBuilder(); - getNodeMetricsFieldBuilder(); - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (allAddressesBuilder_ == null) { allAddresses_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + allAddresses_ = null; allAddressesBuilder_.clear(); } - allMetricNames_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); + allMetricNames_ = + org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList(); if (nodeMetricsBuilder_ == null) { nodeMetrics_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); } else { + nodeMetrics_ = null; nodeMetricsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -1590,7 +1507,13 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Metr @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip buildPartial() { org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip result = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip result) { if (allAddressesBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { allAddresses_ = java.util.Collections.unmodifiableList(allAddresses_); @@ -1600,11 +1523,6 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Metr } else { result.allAddresses_ = allAddressesBuilder_.build(); } - if (((bitField0_ & 0x00000002) != 0)) { - allMetricNames_ = allMetricNames_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000002); - } - result.allMetricNames_ = allMetricNames_; if (nodeMetricsBuilder_ == null) { if (((bitField0_ & 0x00000004) != 0)) { nodeMetrics_ = java.util.Collections.unmodifiableList(nodeMetrics_); @@ -1614,8 +1532,14 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Metr } else { result.nodeMetrics_ = nodeMetricsBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + allMetricNames_.makeImmutable(); + result.allMetricNames_ = allMetricNames_; + } } @java.lang.Override @@ -1691,7 +1615,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMe if (!other.allMetricNames_.isEmpty()) { if (allMetricNames_.isEmpty()) { allMetricNames_ = other.allMetricNames_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ |= 0x00000002; } else { ensureAllMetricNamesIsMutable(); allMetricNames_.addAll(other.allMetricNames_); @@ -1724,7 +1648,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMe } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1749,17 +1673,62 @@ public Builder mergeFrom( org.apache.pekko.protobufv3.internal.CodedInputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address m = + input.readMessage( + org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.PARSER, + extensionRegistry); + if (allAddressesBuilder_ == null) { + ensureAllAddressesIsMutable(); + allAddresses_.add(m); + } else { + allAddressesBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: { + org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes(); + ensureAllMetricNamesIsMutable(); + allMetricNames_.add(bs); + break; + } // case 18 + case 26: { + org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics m = + input.readMessage( + org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.PARSER, + extensionRegistry); + if (nodeMetricsBuilder_ == null) { + ensureNodeMetricsIsMutable(); + nodeMetrics_.add(m); + } else { + nodeMetricsBuilder_.addMessage(m); + } + break; + } // case 26 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { - parsedMessage = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -2004,12 +1973,13 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Addr return allAddressesBuilder_; } - private org.apache.pekko.protobufv3.internal.LazyStringList allMetricNames_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList(); + private org.apache.pekko.protobufv3.internal.LazyStringArrayList allMetricNames_ = + org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList(); private void ensureAllMetricNamesIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!allMetricNames_.isModifiable()) { allMetricNames_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(allMetricNames_); - bitField0_ |= 0x00000002; - } + } + bitField0_ |= 0x00000002; } /** * repeated string allMetricNames = 2; @@ -2017,7 +1987,8 @@ private void ensureAllMetricNamesIsMutable() { */ public org.apache.pekko.protobufv3.internal.ProtocolStringList getAllMetricNamesList() { - return allMetricNames_.getUnmodifiableView(); + allMetricNames_.makeImmutable(); + return allMetricNames_; } /** * repeated string allMetricNames = 2; @@ -2051,11 +2022,10 @@ public java.lang.String getAllMetricNames(int index) { */ public Builder setAllMetricNames( int index, java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - ensureAllMetricNamesIsMutable(); + if (value == null) { throw new NullPointerException(); } + ensureAllMetricNamesIsMutable(); allMetricNames_.set(index, value); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -2066,11 +2036,10 @@ public Builder setAllMetricNames( */ public Builder addAllMetricNames( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - ensureAllMetricNamesIsMutable(); + if (value == null) { throw new NullPointerException(); } + ensureAllMetricNamesIsMutable(); allMetricNames_.add(value); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -2084,6 +2053,7 @@ public Builder addAllAllMetricNames( ensureAllMetricNamesIsMutable(); org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll( values, allMetricNames_); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -2092,8 +2062,9 @@ public Builder addAllAllMetricNames( * @return This builder for chaining. */ public Builder clearAllMetricNames() { - allMetricNames_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + allMetricNames_ = + org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002);; onChanged(); return this; } @@ -2104,11 +2075,10 @@ public Builder clearAllMetricNames() { */ public Builder addAllMetricNamesBytes( org.apache.pekko.protobufv3.internal.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - ensureAllMetricNamesIsMutable(); + if (value == null) { throw new NullPointerException(); } + ensureAllMetricNamesIsMutable(); allMetricNames_.add(value); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -2385,7 +2355,18 @@ public MetricsGossip parsePartialFrom( org.apache.pekko.protobufv3.internal.CodedInputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException { - return new MetricsGossip(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -2463,7 +2444,7 @@ org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics * * Protobuf type {@code NodeMetrics} */ - public static final class NodeMetrics extends + public static final class NodeMetrics extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:NodeMetrics) NodeMetricsOrBuilder { @@ -2483,71 +2464,6 @@ protected java.lang.Object newInstance( return new NodeMetrics(); } - @java.lang.Override - public final org.apache.pekko.protobufv3.internal.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private NodeMetrics( - org.apache.pekko.protobufv3.internal.CodedInputStream input, - org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) - throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields = - org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: { - bitField0_ |= 0x00000001; - addressIndex_ = input.readInt32(); - break; - } - case 16: { - bitField0_ |= 0x00000002; - timestamp_ = input.readInt64(); - break; - } - case 26: { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - metrics_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - metrics_.add( - input.readMessage(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.PARSER, extensionRegistry)); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000004) != 0)) { - metrics_ = java.util.Collections.unmodifiableList(metrics_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor() { return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_descriptor; @@ -2735,7 +2651,7 @@ public interface NumberOrBuilder extends /** * Protobuf type {@code NodeMetrics.Number} */ - public static final class Number extends + public static final class Number extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:NodeMetrics.Number) NumberOrBuilder { @@ -2756,115 +2672,45 @@ protected java.lang.Object newInstance( return new Number(); } + public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor + getDescriptor() { + return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Number_descriptor; + } + @java.lang.Override - public final org.apache.pekko.protobufv3.internal.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Number( - org.apache.pekko.protobufv3.internal.CodedInputStream input, - org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) - throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields = - org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: { - int rawValue = input.readEnum(); - @SuppressWarnings("deprecation") - org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType value = org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(1, rawValue); - } else { - bitField0_ |= 0x00000001; - type_ = rawValue; - } - break; - } - case 16: { - bitField0_ |= 0x00000002; - value32_ = input.readUInt32(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - value64_ = input.readUInt64(); - break; - } - case 34: { - bitField0_ |= 0x00000008; - serialized_ = input.readBytes(); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor - getDescriptor() { - return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Number_descriptor; - } - - @java.lang.Override - protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Number_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.Builder.class); + protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Number_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.Builder.class); } private int bitField0_; public static final int TYPE_FIELD_NUMBER = 1; - private int type_; + private int type_ = 0; /** * required .NodeMetrics.NumberType type = 1; * @return Whether the type field is set. */ - public boolean hasType() { + @java.lang.Override public boolean hasType() { return ((bitField0_ & 0x00000001) != 0); } /** * required .NodeMetrics.NumberType type = 1; * @return The type. */ - public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType getType() { - @SuppressWarnings("deprecation") - org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType result = org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType.valueOf(type_); + @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType getType() { + org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType result = org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType.forNumber(type_); return result == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType.Serialized : result; } public static final int VALUE32_FIELD_NUMBER = 2; - private int value32_; + private int value32_ = 0; /** * optional uint32 value32 = 2; * @return Whether the value32 field is set. */ + @java.lang.Override public boolean hasValue32() { return ((bitField0_ & 0x00000002) != 0); } @@ -2872,16 +2718,18 @@ public boolean hasValue32() { * optional uint32 value32 = 2; * @return The value32. */ + @java.lang.Override public int getValue32() { return value32_; } public static final int VALUE64_FIELD_NUMBER = 3; - private long value64_; + private long value64_ = 0L; /** * optional uint64 value64 = 3; * @return Whether the value64 field is set. */ + @java.lang.Override public boolean hasValue64() { return ((bitField0_ & 0x00000004) != 0); } @@ -2889,16 +2737,18 @@ public boolean hasValue64() { * optional uint64 value64 = 3; * @return The value64. */ + @java.lang.Override public long getValue64() { return value64_; } public static final int SERIALIZED_FIELD_NUMBER = 4; - private org.apache.pekko.protobufv3.internal.ByteString serialized_; + private org.apache.pekko.protobufv3.internal.ByteString serialized_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY; /** * optional bytes serialized = 4; * @return Whether the serialized field is set. */ + @java.lang.Override public boolean hasSerialized() { return ((bitField0_ & 0x00000008) != 0); } @@ -2906,6 +2756,7 @@ public boolean hasSerialized() { * optional bytes serialized = 4; * @return The serialized. */ + @java.lang.Override public org.apache.pekko.protobufv3.internal.ByteString getSerialized() { return serialized_; } @@ -2940,7 +2791,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu if (((bitField0_ & 0x00000008) != 0)) { output.writeBytes(4, serialized_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -2965,7 +2816,7 @@ public int getSerializedSize() { size += org.apache.pekko.protobufv3.internal.CodedOutputStream .computeBytesSize(4, serialized_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -2999,7 +2850,7 @@ public boolean equals(final java.lang.Object obj) { if (!getSerialized() .equals(other.getSerialized())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -3027,7 +2878,7 @@ public int hashCode() { hash = (37 * hash) + SERIALIZED_FIELD_NUMBER; hash = (53 * hash) + getSerialized().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -3076,11 +2927,13 @@ public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessag return org.apache.pekko.protobufv3.internal.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } + public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return org.apache.pekko.protobufv3.internal.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } + public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseDelimitedFrom( java.io.InputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) @@ -3144,30 +2997,22 @@ public static final class Builder extends // Construct using org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; type_ = 0; - bitField0_ = (bitField0_ & ~0x00000001); value32_ = 0; - bitField0_ = (bitField0_ & ~0x00000002); value64_ = 0L; - bitField0_ = (bitField0_ & ~0x00000004); serialized_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY; - bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -3194,12 +3039,18 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Node @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number buildPartial() { org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number result = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { + result.type_ = type_; to_bitField0_ |= 0x00000001; } - result.type_ = type_; if (((from_bitField0_ & 0x00000002) != 0)) { result.value32_ = value32_; to_bitField0_ |= 0x00000002; @@ -3209,12 +3060,10 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Node to_bitField0_ |= 0x00000004; } if (((from_bitField0_ & 0x00000008) != 0)) { + result.serialized_ = serialized_; to_bitField0_ |= 0x00000008; } - result.serialized_ = serialized_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -3273,7 +3122,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMe if (other.hasSerialized()) { setSerialized(other.getSerialized()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -3291,17 +3140,57 @@ public Builder mergeFrom( org.apache.pekko.protobufv3.internal.CodedInputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + int tmpRaw = input.readEnum(); + org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType tmpValue = + org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType.forNumber(tmpRaw); + if (tmpValue == null) { + mergeUnknownVarintField(1, tmpRaw); + } else { + type_ = tmpRaw; + bitField0_ |= 0x00000001; + } + break; + } // case 8 + case 16: { + value32_ = input.readUInt32(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 24: { + value64_ = input.readUInt64(); + bitField0_ |= 0x00000004; + break; + } // case 24 + case 34: { + serialized_ = input.readBytes(); + bitField0_ |= 0x00000008; + break; + } // case 34 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { - parsedMessage = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -3311,16 +3200,16 @@ public Builder mergeFrom( * required .NodeMetrics.NumberType type = 1; * @return Whether the type field is set. */ - public boolean hasType() { + @java.lang.Override public boolean hasType() { return ((bitField0_ & 0x00000001) != 0); } /** * required .NodeMetrics.NumberType type = 1; * @return The type. */ + @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType getType() { - @SuppressWarnings("deprecation") - org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType result = org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType.valueOf(type_); + org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType result = org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType.forNumber(type_); return result == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType.Serialized : result; } /** @@ -3353,6 +3242,7 @@ public Builder clearType() { * optional uint32 value32 = 2; * @return Whether the value32 field is set. */ + @java.lang.Override public boolean hasValue32() { return ((bitField0_ & 0x00000002) != 0); } @@ -3360,6 +3250,7 @@ public boolean hasValue32() { * optional uint32 value32 = 2; * @return The value32. */ + @java.lang.Override public int getValue32() { return value32_; } @@ -3369,8 +3260,9 @@ public int getValue32() { * @return This builder for chaining. */ public Builder setValue32(int value) { - bitField0_ |= 0x00000002; + value32_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -3390,6 +3282,7 @@ public Builder clearValue32() { * optional uint64 value64 = 3; * @return Whether the value64 field is set. */ + @java.lang.Override public boolean hasValue64() { return ((bitField0_ & 0x00000004) != 0); } @@ -3397,6 +3290,7 @@ public boolean hasValue64() { * optional uint64 value64 = 3; * @return The value64. */ + @java.lang.Override public long getValue64() { return value64_; } @@ -3406,8 +3300,9 @@ public long getValue64() { * @return This builder for chaining. */ public Builder setValue64(long value) { - bitField0_ |= 0x00000004; + value64_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -3427,6 +3322,7 @@ public Builder clearValue64() { * optional bytes serialized = 4; * @return Whether the serialized field is set. */ + @java.lang.Override public boolean hasSerialized() { return ((bitField0_ & 0x00000008) != 0); } @@ -3434,6 +3330,7 @@ public boolean hasSerialized() { * optional bytes serialized = 4; * @return The serialized. */ + @java.lang.Override public org.apache.pekko.protobufv3.internal.ByteString getSerialized() { return serialized_; } @@ -3443,11 +3340,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getSerialized() { * @return This builder for chaining. */ public Builder setSerialized(org.apache.pekko.protobufv3.internal.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000008; + if (value == null) { throw new NullPointerException(); } serialized_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -3494,7 +3389,18 @@ public Number parsePartialFrom( org.apache.pekko.protobufv3.internal.CodedInputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException { - return new Number(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -3543,7 +3449,7 @@ public interface EWMAOrBuilder extends /** * Protobuf type {@code NodeMetrics.EWMA} */ - public static final class EWMA extends + public static final class EWMA extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:NodeMetrics.EWMA) EWMAOrBuilder { @@ -3562,59 +3468,6 @@ protected java.lang.Object newInstance( return new EWMA(); } - @java.lang.Override - public final org.apache.pekko.protobufv3.internal.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private EWMA( - org.apache.pekko.protobufv3.internal.CodedInputStream input, - org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) - throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields = - org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 9: { - bitField0_ |= 0x00000001; - value_ = input.readDouble(); - break; - } - case 17: { - bitField0_ |= 0x00000002; - alpha_ = input.readDouble(); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor() { return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_EWMA_descriptor; @@ -3630,11 +3483,12 @@ private EWMA( private int bitField0_; public static final int VALUE_FIELD_NUMBER = 1; - private double value_; + private double value_ = 0D; /** * required double value = 1; * @return Whether the value field is set. */ + @java.lang.Override public boolean hasValue() { return ((bitField0_ & 0x00000001) != 0); } @@ -3642,16 +3496,18 @@ public boolean hasValue() { * required double value = 1; * @return The value. */ + @java.lang.Override public double getValue() { return value_; } public static final int ALPHA_FIELD_NUMBER = 2; - private double alpha_; + private double alpha_ = 0D; /** * required double alpha = 2; * @return Whether the alpha field is set. */ + @java.lang.Override public boolean hasAlpha() { return ((bitField0_ & 0x00000002) != 0); } @@ -3659,6 +3515,7 @@ public boolean hasAlpha() { * required double alpha = 2; * @return The alpha. */ + @java.lang.Override public double getAlpha() { return alpha_; } @@ -3691,7 +3548,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu if (((bitField0_ & 0x00000002) != 0)) { output.writeDouble(2, alpha_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -3708,7 +3565,7 @@ public int getSerializedSize() { size += org.apache.pekko.protobufv3.internal.CodedOutputStream .computeDoubleSize(2, alpha_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -3735,7 +3592,7 @@ public boolean equals(final java.lang.Object obj) { != java.lang.Double.doubleToLongBits( other.getAlpha())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -3756,7 +3613,7 @@ public int hashCode() { hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong( java.lang.Double.doubleToLongBits(getAlpha())); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -3805,11 +3662,13 @@ public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessag return org.apache.pekko.protobufv3.internal.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } + public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return org.apache.pekko.protobufv3.internal.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } + public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseDelimitedFrom( java.io.InputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) @@ -3873,26 +3732,20 @@ public static final class Builder extends // Construct using org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; value_ = 0D; - bitField0_ = (bitField0_ & ~0x00000001); alpha_ = 0D; - bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -3919,6 +3772,12 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Node @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA buildPartial() { org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA result = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -3929,9 +3788,7 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Node result.alpha_ = alpha_; to_bitField0_ |= 0x00000002; } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -3984,7 +3841,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMe if (other.hasAlpha()) { setAlpha(other.getAlpha()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -4005,17 +3862,40 @@ public Builder mergeFrom( org.apache.pekko.protobufv3.internal.CodedInputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 9: { + value_ = input.readDouble(); + bitField0_ |= 0x00000001; + break; + } // case 9 + case 17: { + alpha_ = input.readDouble(); + bitField0_ |= 0x00000002; + break; + } // case 17 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { - parsedMessage = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -4025,6 +3905,7 @@ public Builder mergeFrom( * required double value = 1; * @return Whether the value field is set. */ + @java.lang.Override public boolean hasValue() { return ((bitField0_ & 0x00000001) != 0); } @@ -4032,6 +3913,7 @@ public boolean hasValue() { * required double value = 1; * @return The value. */ + @java.lang.Override public double getValue() { return value_; } @@ -4041,8 +3923,9 @@ public double getValue() { * @return This builder for chaining. */ public Builder setValue(double value) { - bitField0_ |= 0x00000001; + value_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -4062,6 +3945,7 @@ public Builder clearValue() { * required double alpha = 2; * @return Whether the alpha field is set. */ + @java.lang.Override public boolean hasAlpha() { return ((bitField0_ & 0x00000002) != 0); } @@ -4069,6 +3953,7 @@ public boolean hasAlpha() { * required double alpha = 2; * @return The alpha. */ + @java.lang.Override public double getAlpha() { return alpha_; } @@ -4078,8 +3963,9 @@ public double getAlpha() { * @return This builder for chaining. */ public Builder setAlpha(double value) { - bitField0_ |= 0x00000002; + alpha_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -4126,7 +4012,18 @@ public EWMA parsePartialFrom( org.apache.pekko.protobufv3.internal.CodedInputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException { - return new EWMA(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -4194,7 +4091,7 @@ public interface MetricOrBuilder extends /** * Protobuf type {@code NodeMetrics.Metric} */ - public static final class Metric extends + public static final class Metric extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:NodeMetrics.Metric) MetricOrBuilder { @@ -4213,80 +4110,6 @@ protected java.lang.Object newInstance( return new Metric(); } - @java.lang.Override - public final org.apache.pekko.protobufv3.internal.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Metric( - org.apache.pekko.protobufv3.internal.CodedInputStream input, - org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) - throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields = - org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: { - bitField0_ |= 0x00000001; - nameIndex_ = input.readInt32(); - break; - } - case 18: { - org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) != 0)) { - subBuilder = number_.toBuilder(); - } - number_ = input.readMessage(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(number_); - number_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000002; - break; - } - case 26: { - org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.Builder subBuilder = null; - if (((bitField0_ & 0x00000004) != 0)) { - subBuilder = ewma_.toBuilder(); - } - ewma_ = input.readMessage(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(ewma_); - ewma_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000004; - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor() { return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Metric_descriptor; @@ -4302,11 +4125,12 @@ private Metric( private int bitField0_; public static final int NAMEINDEX_FIELD_NUMBER = 1; - private int nameIndex_; + private int nameIndex_ = 0; /** * required int32 nameIndex = 1; * @return Whether the nameIndex field is set. */ + @java.lang.Override public boolean hasNameIndex() { return ((bitField0_ & 0x00000001) != 0); } @@ -4314,6 +4138,7 @@ public boolean hasNameIndex() { * required int32 nameIndex = 1; * @return The nameIndex. */ + @java.lang.Override public int getNameIndex() { return nameIndex_; } @@ -4324,6 +4149,7 @@ public int getNameIndex() { * required .NodeMetrics.Number number = 2; * @return Whether the number field is set. */ + @java.lang.Override public boolean hasNumber() { return ((bitField0_ & 0x00000002) != 0); } @@ -4331,12 +4157,14 @@ public boolean hasNumber() { * required .NodeMetrics.Number number = 2; * @return The number. */ + @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number getNumber() { return number_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.getDefaultInstance() : number_; } /** * required .NodeMetrics.Number number = 2; */ + @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberOrBuilder getNumberOrBuilder() { return number_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.getDefaultInstance() : number_; } @@ -4347,6 +4175,7 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Node * optional .NodeMetrics.EWMA ewma = 3; * @return Whether the ewma field is set. */ + @java.lang.Override public boolean hasEwma() { return ((bitField0_ & 0x00000004) != 0); } @@ -4354,12 +4183,14 @@ public boolean hasEwma() { * optional .NodeMetrics.EWMA ewma = 3; * @return The ewma. */ + @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA getEwma() { return ewma_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.getDefaultInstance() : ewma_; } /** * optional .NodeMetrics.EWMA ewma = 3; */ + @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMAOrBuilder getEwmaOrBuilder() { return ewma_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.getDefaultInstance() : ewma_; } @@ -4405,7 +4236,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu if (((bitField0_ & 0x00000004) != 0)) { output.writeMessage(3, getEwma()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -4426,7 +4257,7 @@ public int getSerializedSize() { size += org.apache.pekko.protobufv3.internal.CodedOutputStream .computeMessageSize(3, getEwma()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -4456,7 +4287,7 @@ public boolean equals(final java.lang.Object obj) { if (!getEwma() .equals(other.getEwma())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -4479,7 +4310,7 @@ public int hashCode() { hash = (37 * hash) + EWMA_FIELD_NUMBER; hash = (53 * hash) + getEwma().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -4528,11 +4359,13 @@ public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessag return org.apache.pekko.protobufv3.internal.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } + public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return org.apache.pekko.protobufv3.internal.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } + public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseDelimitedFrom( java.io.InputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) @@ -4614,20 +4447,18 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; nameIndex_ = 0; - bitField0_ = (bitField0_ & ~0x00000001); - if (numberBuilder_ == null) { - number_ = null; - } else { - numberBuilder_.clear(); + number_ = null; + if (numberBuilder_ != null) { + numberBuilder_.dispose(); + numberBuilder_ = null; } - bitField0_ = (bitField0_ & ~0x00000002); - if (ewmaBuilder_ == null) { - ewma_ = null; - } else { - ewmaBuilder_.clear(); + ewma_ = null; + if (ewmaBuilder_ != null) { + ewmaBuilder_.dispose(); + ewmaBuilder_ = null; } - bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -4654,6 +4485,12 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Node @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric buildPartial() { org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric result = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -4661,24 +4498,18 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Node to_bitField0_ |= 0x00000001; } if (((from_bitField0_ & 0x00000002) != 0)) { - if (numberBuilder_ == null) { - result.number_ = number_; - } else { - result.number_ = numberBuilder_.build(); - } + result.number_ = numberBuilder_ == null + ? number_ + : numberBuilder_.build(); to_bitField0_ |= 0x00000002; } if (((from_bitField0_ & 0x00000004) != 0)) { - if (ewmaBuilder_ == null) { - result.ewma_ = ewma_; - } else { - result.ewma_ = ewmaBuilder_.build(); - } + result.ewma_ = ewmaBuilder_ == null + ? ewma_ + : ewmaBuilder_.build(); to_bitField0_ |= 0x00000004; } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -4734,7 +4565,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMe if (other.hasEwma()) { mergeEwma(other.getEwma()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -4763,17 +4594,49 @@ public Builder mergeFrom( org.apache.pekko.protobufv3.internal.CodedInputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + nameIndex_ = input.readInt32(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 18: { + input.readMessage( + getNumberFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 26: { + input.readMessage( + getEwmaFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000004; + break; + } // case 26 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { - parsedMessage = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -4783,6 +4646,7 @@ public Builder mergeFrom( * required int32 nameIndex = 1; * @return Whether the nameIndex field is set. */ + @java.lang.Override public boolean hasNameIndex() { return ((bitField0_ & 0x00000001) != 0); } @@ -4790,6 +4654,7 @@ public boolean hasNameIndex() { * required int32 nameIndex = 1; * @return The nameIndex. */ + @java.lang.Override public int getNameIndex() { return nameIndex_; } @@ -4799,8 +4664,9 @@ public int getNameIndex() { * @return This builder for chaining. */ public Builder setNameIndex(int value) { - bitField0_ |= 0x00000001; + nameIndex_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -4845,11 +4711,11 @@ public Builder setNumber(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMe throw new NullPointerException(); } number_ = value; - onChanged(); } else { numberBuilder_.setMessage(value); } bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -4859,11 +4725,11 @@ public Builder setNumber( org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.Builder builderForValue) { if (numberBuilder_ == null) { number_ = builderForValue.build(); - onChanged(); } else { numberBuilder_.setMessage(builderForValue.build()); } bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -4872,31 +4738,32 @@ public Builder setNumber( public Builder mergeNumber(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number value) { if (numberBuilder_ == null) { if (((bitField0_ & 0x00000002) != 0) && - number_ != null && - number_ != org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.getDefaultInstance()) { - number_ = - org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.newBuilder(number_).mergeFrom(value).buildPartial(); + number_ != null && + number_ != org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.getDefaultInstance()) { + getNumberBuilder().mergeFrom(value); } else { number_ = value; } - onChanged(); } else { numberBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000002; + if (number_ != null) { + bitField0_ |= 0x00000002; + onChanged(); + } return this; } /** * required .NodeMetrics.Number number = 2; */ public Builder clearNumber() { - if (numberBuilder_ == null) { - number_ = null; - onChanged(); - } else { - numberBuilder_.clear(); - } bitField0_ = (bitField0_ & ~0x00000002); + number_ = null; + if (numberBuilder_ != null) { + numberBuilder_.dispose(); + numberBuilder_ = null; + } + onChanged(); return this; } /** @@ -4965,11 +4832,11 @@ public Builder setEwma(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetr throw new NullPointerException(); } ewma_ = value; - onChanged(); } else { ewmaBuilder_.setMessage(value); } bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -4979,11 +4846,11 @@ public Builder setEwma( org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.Builder builderForValue) { if (ewmaBuilder_ == null) { ewma_ = builderForValue.build(); - onChanged(); } else { ewmaBuilder_.setMessage(builderForValue.build()); } bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -4992,31 +4859,32 @@ public Builder setEwma( public Builder mergeEwma(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA value) { if (ewmaBuilder_ == null) { if (((bitField0_ & 0x00000004) != 0) && - ewma_ != null && - ewma_ != org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.getDefaultInstance()) { - ewma_ = - org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.newBuilder(ewma_).mergeFrom(value).buildPartial(); + ewma_ != null && + ewma_ != org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.getDefaultInstance()) { + getEwmaBuilder().mergeFrom(value); } else { ewma_ = value; } - onChanged(); } else { ewmaBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000004; + if (ewma_ != null) { + bitField0_ |= 0x00000004; + onChanged(); + } return this; } /** * optional .NodeMetrics.EWMA ewma = 3; */ public Builder clearEwma() { - if (ewmaBuilder_ == null) { - ewma_ = null; - onChanged(); - } else { - ewmaBuilder_.clear(); - } bitField0_ = (bitField0_ & ~0x00000004); + ewma_ = null; + if (ewmaBuilder_ != null) { + ewmaBuilder_.dispose(); + ewmaBuilder_ = null; + } + onChanged(); return this; } /** @@ -5087,7 +4955,18 @@ public Metric parsePartialFrom( org.apache.pekko.protobufv3.internal.CodedInputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException { - return new Metric(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -5109,11 +4988,12 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Node private int bitField0_; public static final int ADDRESSINDEX_FIELD_NUMBER = 1; - private int addressIndex_; + private int addressIndex_ = 0; /** * required int32 addressIndex = 1; * @return Whether the addressIndex field is set. */ + @java.lang.Override public boolean hasAddressIndex() { return ((bitField0_ & 0x00000001) != 0); } @@ -5121,16 +5001,18 @@ public boolean hasAddressIndex() { * required int32 addressIndex = 1; * @return The addressIndex. */ + @java.lang.Override public int getAddressIndex() { return addressIndex_; } public static final int TIMESTAMP_FIELD_NUMBER = 2; - private long timestamp_; + private long timestamp_ = 0L; /** * required int64 timestamp = 2; * @return Whether the timestamp field is set. */ + @java.lang.Override public boolean hasTimestamp() { return ((bitField0_ & 0x00000002) != 0); } @@ -5138,21 +5020,25 @@ public boolean hasTimestamp() { * required int64 timestamp = 2; * @return The timestamp. */ + @java.lang.Override public long getTimestamp() { return timestamp_; } public static final int METRICS_FIELD_NUMBER = 3; + @SuppressWarnings("serial") private java.util.List metrics_; /** * repeated .NodeMetrics.Metric metrics = 3; */ + @java.lang.Override public java.util.List getMetricsList() { return metrics_; } /** * repeated .NodeMetrics.Metric metrics = 3; */ + @java.lang.Override public java.util.List getMetricsOrBuilderList() { return metrics_; @@ -5160,18 +5046,21 @@ public java.util.Listrepeated .NodeMetrics.Metric metrics = 3; */ + @java.lang.Override public int getMetricsCount() { return metrics_.size(); } /** * repeated .NodeMetrics.Metric metrics = 3; */ + @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric getMetrics(int index) { return metrics_.get(index); } /** * repeated .NodeMetrics.Metric metrics = 3; */ + @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.MetricOrBuilder getMetricsOrBuilder( int index) { return metrics_.get(index); @@ -5214,7 +5103,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu for (int i = 0; i < metrics_.size(); i++) { output.writeMessage(3, metrics_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -5235,7 +5124,7 @@ public int getSerializedSize() { size += org.apache.pekko.protobufv3.internal.CodedOutputStream .computeMessageSize(3, metrics_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -5262,7 +5151,7 @@ public boolean equals(final java.lang.Object obj) { } if (!getMetricsList() .equals(other.getMetricsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -5286,7 +5175,7 @@ public int hashCode() { hash = (37 * hash) + METRICS_FIELD_NUMBER; hash = (53 * hash) + getMetricsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -5335,11 +5224,13 @@ public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessag return org.apache.pekko.protobufv3.internal.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } + public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return org.apache.pekko.protobufv3.internal.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } + public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseDelimitedFrom( java.io.InputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) @@ -5408,33 +5299,27 @@ public static final class Builder extends // Construct using org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - getMetricsFieldBuilder(); - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; addressIndex_ = 0; - bitField0_ = (bitField0_ & ~0x00000001); timestamp_ = 0L; - bitField0_ = (bitField0_ & ~0x00000002); if (metricsBuilder_ == null) { metrics_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); } else { + metrics_ = null; metricsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -5461,6 +5346,25 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Node @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics buildPartial() { org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics result = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics(this); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics result) { + if (metricsBuilder_ == null) { + if (((bitField0_ & 0x00000004) != 0)) { + metrics_ = java.util.Collections.unmodifiableList(metrics_); + bitField0_ = (bitField0_ & ~0x00000004); + } + result.metrics_ = metrics_; + } else { + result.metrics_ = metricsBuilder_.build(); + } + } + + private void buildPartial0(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -5471,18 +5375,7 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Node result.timestamp_ = timestamp_; to_bitField0_ |= 0x00000002; } - if (metricsBuilder_ == null) { - if (((bitField0_ & 0x00000004) != 0)) { - metrics_ = java.util.Collections.unmodifiableList(metrics_); - bitField0_ = (bitField0_ & ~0x00000004); - } - result.metrics_ = metrics_; - } else { - result.metrics_ = metricsBuilder_.build(); - } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -5561,7 +5454,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMe } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -5587,17 +5480,53 @@ public Builder mergeFrom( org.apache.pekko.protobufv3.internal.CodedInputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + addressIndex_ = input.readInt32(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 16: { + timestamp_ = input.readInt64(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 26: { + org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric m = + input.readMessage( + org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.PARSER, + extensionRegistry); + if (metricsBuilder_ == null) { + ensureMetricsIsMutable(); + metrics_.add(m); + } else { + metricsBuilder_.addMessage(m); + } + break; + } // case 26 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { - parsedMessage = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -5607,6 +5536,7 @@ public Builder mergeFrom( * required int32 addressIndex = 1; * @return Whether the addressIndex field is set. */ + @java.lang.Override public boolean hasAddressIndex() { return ((bitField0_ & 0x00000001) != 0); } @@ -5614,6 +5544,7 @@ public boolean hasAddressIndex() { * required int32 addressIndex = 1; * @return The addressIndex. */ + @java.lang.Override public int getAddressIndex() { return addressIndex_; } @@ -5623,8 +5554,9 @@ public int getAddressIndex() { * @return This builder for chaining. */ public Builder setAddressIndex(int value) { - bitField0_ |= 0x00000001; + addressIndex_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -5644,6 +5576,7 @@ public Builder clearAddressIndex() { * required int64 timestamp = 2; * @return Whether the timestamp field is set. */ + @java.lang.Override public boolean hasTimestamp() { return ((bitField0_ & 0x00000002) != 0); } @@ -5651,6 +5584,7 @@ public boolean hasTimestamp() { * required int64 timestamp = 2; * @return The timestamp. */ + @java.lang.Override public long getTimestamp() { return timestamp_; } @@ -5660,8 +5594,9 @@ public long getTimestamp() { * @return This builder for chaining. */ public Builder setTimestamp(long value) { - bitField0_ |= 0x00000002; + timestamp_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -5948,7 +5883,18 @@ public NodeMetrics parsePartialFrom( org.apache.pekko.protobufv3.internal.CodedInputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException { - return new NodeMetrics(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -6042,7 +5988,7 @@ public interface AddressOrBuilder extends * * Protobuf type {@code Address} */ - public static final class Address extends + public static final class Address extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:Address) AddressOrBuilder { @@ -6064,72 +6010,6 @@ protected java.lang.Object newInstance( return new Address(); } - @java.lang.Override - public final org.apache.pekko.protobufv3.internal.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Address( - org.apache.pekko.protobufv3.internal.CodedInputStream input, - org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) - throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields = - org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000001; - system_ = bs; - break; - } - case 18: { - org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000002; - hostname_ = bs; - break; - } - case 24: { - bitField0_ |= 0x00000004; - port_ = input.readUInt32(); - break; - } - case 34: { - org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000008; - protocol_ = bs; - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor() { return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_Address_descriptor; @@ -6145,11 +6025,13 @@ private Address( private int bitField0_; public static final int SYSTEM_FIELD_NUMBER = 1; - private volatile java.lang.Object system_; + @SuppressWarnings("serial") + private volatile java.lang.Object system_ = ""; /** * required string system = 1; * @return Whether the system field is set. */ + @java.lang.Override public boolean hasSystem() { return ((bitField0_ & 0x00000001) != 0); } @@ -6157,6 +6039,7 @@ public boolean hasSystem() { * required string system = 1; * @return The system. */ + @java.lang.Override public java.lang.String getSystem() { java.lang.Object ref = system_; if (ref instanceof java.lang.String) { @@ -6175,6 +6058,7 @@ public java.lang.String getSystem() { * required string system = 1; * @return The bytes for system. */ + @java.lang.Override public org.apache.pekko.protobufv3.internal.ByteString getSystemBytes() { java.lang.Object ref = system_; @@ -6190,11 +6074,13 @@ public java.lang.String getSystem() { } public static final int HOSTNAME_FIELD_NUMBER = 2; - private volatile java.lang.Object hostname_; + @SuppressWarnings("serial") + private volatile java.lang.Object hostname_ = ""; /** * required string hostname = 2; * @return Whether the hostname field is set. */ + @java.lang.Override public boolean hasHostname() { return ((bitField0_ & 0x00000002) != 0); } @@ -6202,6 +6088,7 @@ public boolean hasHostname() { * required string hostname = 2; * @return The hostname. */ + @java.lang.Override public java.lang.String getHostname() { java.lang.Object ref = hostname_; if (ref instanceof java.lang.String) { @@ -6220,6 +6107,7 @@ public java.lang.String getHostname() { * required string hostname = 2; * @return The bytes for hostname. */ + @java.lang.Override public org.apache.pekko.protobufv3.internal.ByteString getHostnameBytes() { java.lang.Object ref = hostname_; @@ -6235,11 +6123,12 @@ public java.lang.String getHostname() { } public static final int PORT_FIELD_NUMBER = 3; - private int port_; + private int port_ = 0; /** * required uint32 port = 3; * @return Whether the port field is set. */ + @java.lang.Override public boolean hasPort() { return ((bitField0_ & 0x00000004) != 0); } @@ -6247,16 +6136,19 @@ public boolean hasPort() { * required uint32 port = 3; * @return The port. */ + @java.lang.Override public int getPort() { return port_; } public static final int PROTOCOL_FIELD_NUMBER = 4; - private volatile java.lang.Object protocol_; + @SuppressWarnings("serial") + private volatile java.lang.Object protocol_ = ""; /** * optional string protocol = 4; * @return Whether the protocol field is set. */ + @java.lang.Override public boolean hasProtocol() { return ((bitField0_ & 0x00000008) != 0); } @@ -6264,6 +6156,7 @@ public boolean hasProtocol() { * optional string protocol = 4; * @return The protocol. */ + @java.lang.Override public java.lang.String getProtocol() { java.lang.Object ref = protocol_; if (ref instanceof java.lang.String) { @@ -6282,6 +6175,7 @@ public java.lang.String getProtocol() { * optional string protocol = 4; * @return The bytes for protocol. */ + @java.lang.Override public org.apache.pekko.protobufv3.internal.ByteString getProtocolBytes() { java.lang.Object ref = protocol_; @@ -6334,7 +6228,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu if (((bitField0_ & 0x00000008) != 0)) { org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, protocol_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -6356,7 +6250,7 @@ public int getSerializedSize() { if (((bitField0_ & 0x00000008) != 0)) { size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(4, protocol_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -6391,7 +6285,7 @@ public boolean equals(final java.lang.Object obj) { if (!getProtocol() .equals(other.getProtocol())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -6418,7 +6312,7 @@ public int hashCode() { hash = (37 * hash) + PROTOCOL_FIELD_NUMBER; hash = (53 * hash) + getProtocol().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -6467,11 +6361,13 @@ public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessag return org.apache.pekko.protobufv3.internal.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } + public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return org.apache.pekko.protobufv3.internal.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } + public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseDelimitedFrom( java.io.InputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) @@ -6540,30 +6436,22 @@ public static final class Builder extends // Construct using org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; system_ = ""; - bitField0_ = (bitField0_ & ~0x00000001); hostname_ = ""; - bitField0_ = (bitField0_ & ~0x00000002); port_ = 0; - bitField0_ = (bitField0_ & ~0x00000004); protocol_ = ""; - bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -6590,27 +6478,31 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Addr @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address buildPartial() { org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address result = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { + result.system_ = system_; to_bitField0_ |= 0x00000001; } - result.system_ = system_; if (((from_bitField0_ & 0x00000002) != 0)) { + result.hostname_ = hostname_; to_bitField0_ |= 0x00000002; } - result.hostname_ = hostname_; if (((from_bitField0_ & 0x00000004) != 0)) { result.port_ = port_; to_bitField0_ |= 0x00000004; } if (((from_bitField0_ & 0x00000008) != 0)) { + result.protocol_ = protocol_; to_bitField0_ |= 0x00000008; } - result.protocol_ = protocol_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -6658,24 +6550,24 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) { public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address other) { if (other == org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance()) return this; if (other.hasSystem()) { - bitField0_ |= 0x00000001; system_ = other.system_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasHostname()) { - bitField0_ |= 0x00000002; hostname_ = other.hostname_; + bitField0_ |= 0x00000002; onChanged(); } if (other.hasPort()) { setPort(other.getPort()); } if (other.hasProtocol()) { - bitField0_ |= 0x00000008; protocol_ = other.protocol_; + bitField0_ |= 0x00000008; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -6699,17 +6591,50 @@ public Builder mergeFrom( org.apache.pekko.protobufv3.internal.CodedInputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + system_ = input.readBytes(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + hostname_ = input.readBytes(); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 24: { + port_ = input.readUInt32(); + bitField0_ |= 0x00000004; + break; + } // case 24 + case 34: { + protocol_ = input.readBytes(); + bitField0_ |= 0x00000008; + break; + } // case 34 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { - parsedMessage = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -6764,11 +6689,9 @@ public java.lang.String getSystem() { */ public Builder setSystem( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } system_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -6777,8 +6700,8 @@ public Builder setSystem( * @return This builder for chaining. */ public Builder clearSystem() { - bitField0_ = (bitField0_ & ~0x00000001); system_ = getDefaultInstance().getSystem(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -6789,11 +6712,9 @@ public Builder clearSystem() { */ public Builder setSystemBytes( org.apache.pekko.protobufv3.internal.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } system_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -6848,11 +6769,9 @@ public java.lang.String getHostname() { */ public Builder setHostname( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; + if (value == null) { throw new NullPointerException(); } hostname_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -6861,8 +6780,8 @@ public Builder setHostname( * @return This builder for chaining. */ public Builder clearHostname() { - bitField0_ = (bitField0_ & ~0x00000002); hostname_ = getDefaultInstance().getHostname(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -6873,11 +6792,9 @@ public Builder clearHostname() { */ public Builder setHostnameBytes( org.apache.pekko.protobufv3.internal.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; + if (value == null) { throw new NullPointerException(); } hostname_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -6887,6 +6804,7 @@ public Builder setHostnameBytes( * required uint32 port = 3; * @return Whether the port field is set. */ + @java.lang.Override public boolean hasPort() { return ((bitField0_ & 0x00000004) != 0); } @@ -6894,6 +6812,7 @@ public boolean hasPort() { * required uint32 port = 3; * @return The port. */ + @java.lang.Override public int getPort() { return port_; } @@ -6903,8 +6822,9 @@ public int getPort() { * @return This builder for chaining. */ public Builder setPort(int value) { - bitField0_ |= 0x00000004; + port_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -6969,11 +6889,9 @@ public java.lang.String getProtocol() { */ public Builder setProtocol( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000008; + if (value == null) { throw new NullPointerException(); } protocol_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -6982,8 +6900,8 @@ public Builder setProtocol( * @return This builder for chaining. */ public Builder clearProtocol() { - bitField0_ = (bitField0_ & ~0x00000008); protocol_ = getDefaultInstance().getProtocol(); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } @@ -6994,11 +6912,9 @@ public Builder clearProtocol() { */ public Builder setProtocolBytes( org.apache.pekko.protobufv3.internal.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000008; + if (value == null) { throw new NullPointerException(); } protocol_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -7035,7 +6951,18 @@ public Address parsePartialFrom( org.apache.pekko.protobufv3.internal.CodedInputStream input, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException { - return new Address(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -7140,7 +7067,7 @@ public interface AdaptiveLoadBalancingPoolOrBuilder extends /** * Protobuf type {@code AdaptiveLoadBalancingPool} */ - public static final class AdaptiveLoadBalancingPool extends + public static final class AdaptiveLoadBalancingPool extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:AdaptiveLoadBalancingPool) AdaptiveLoadBalancingPoolOrBuilder { @@ -7152,86 +7079,14 @@ private AdaptiveLoadBalancingPool(org.apache.pekko.protobufv3.internal.Generated private AdaptiveLoadBalancingPool() { routerDispatcher_ = ""; } - - @java.lang.Override - @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( - org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) { - return new AdaptiveLoadBalancingPool(); - } - - @java.lang.Override - public final org.apache.pekko.protobufv3.internal.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private AdaptiveLoadBalancingPool( - org.apache.pekko.protobufv3.internal.CodedInputStream input, - org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry) - throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields = - org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) != 0)) { - subBuilder = metricsSelector_.toBuilder(); - } - metricsSelector_ = input.readMessage(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(metricsSelector_); - metricsSelector_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - case 16: { - bitField0_ |= 0x00000002; - nrOfInstances_ = input.readUInt32(); - break; - } - case 26: { - org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000004; - routerDispatcher_ = bs; - break; - } - case 32: { - bitField0_ |= 0x00000008; - usePoolDispatcher_ = input.readBool(); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) { + return new AdaptiveLoadBalancingPool(); + } + public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor() { return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_AdaptiveLoadBalancingPool_descriptor; @@ -7256,6 +7111,7 @@ private AdaptiveLoadBalancingPool( * optional .MetricsSelector metricsSelector = 1; * @return Whether the metricsSelector field is set. */ + @java.lang.Override public boolean hasMetricsSelector() { return ((bitField0_ & 0x00000001) != 0); } @@ -7267,6 +7123,7 @@ public boolean hasMetricsSelector() { * optional .MetricsSelector metricsSelector = 1; * @return The metricsSelector. */ + @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector getMetricsSelector() { return metricsSelector_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance() : metricsSelector_; } @@ -7277,16 +7134,18 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Metr * * optional .MetricsSelector metricsSelector = 1; */ + @java.lang.Override public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder getMetricsSelectorOrBuilder() { return metricsSelector_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance() : metricsSelector_; } public static final int NROFINSTANCES_FIELD_NUMBER = 2; - private int nrOfInstances_; + private int nrOfInstances_ = 0; /** * required uint32 nrOfInstances = 2; * @return Whether the nrOfInstances field is set. */ + @java.lang.Override public boolean hasNrOfInstances() { return ((bitField0_ & 0x00000002) != 0); } @@ -7294,12 +7153,14 @@ public boolean hasNrOfInstances() { * required uint32 nrOfInstances = 2; * @return The nrOfInstances. */ + @java.lang.Override public int getNrOfInstances() { return nrOfInstances_; } public static final int ROUTERDISPATCHER_FIELD_NUMBER = 3; - private volatile java.lang.Object routerDispatcher_; + @SuppressWarnings("serial") + private volatile java.lang.Object routerDispatcher_ = ""; /** * 
      * omitted if default
@@ -7308,6 +7169,7 @@ public int getNrOfInstances() {
      * optional string routerDispatcher = 3;
      * @return Whether the routerDispatcher field is set.
      */
+    @java.lang.Override
     public boolean hasRouterDispatcher() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -7319,6 +7181,7 @@ public boolean hasRouterDispatcher() {
      * optional string routerDispatcher = 3;
      * @return The routerDispatcher.
      */
+    @java.lang.Override
     public java.lang.String getRouterDispatcher() {
       java.lang.Object ref = routerDispatcher_;
       if (ref instanceof java.lang.String) {
@@ -7341,6 +7204,7 @@ public java.lang.String getRouterDispatcher() {
      * optional string routerDispatcher = 3;
      * @return The bytes for routerDispatcher.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getRouterDispatcherBytes() {
       java.lang.Object ref = routerDispatcher_;
@@ -7356,11 +7220,12 @@ public java.lang.String getRouterDispatcher() {
     }
 
     public static final int USEPOOLDISPATCHER_FIELD_NUMBER = 4;
-    private boolean usePoolDispatcher_;
+    private boolean usePoolDispatcher_ = false;
     /**
      * required bool usePoolDispatcher = 4;
      * @return Whether the usePoolDispatcher field is set.
      */
+    @java.lang.Override
     public boolean hasUsePoolDispatcher() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -7368,6 +7233,7 @@ public boolean hasUsePoolDispatcher() {
      * required bool usePoolDispatcher = 4;
      * @return The usePoolDispatcher.
      */
+    @java.lang.Override
     public boolean getUsePoolDispatcher() {
       return usePoolDispatcher_;
     }
@@ -7412,7 +7278,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeBool(4, usePoolDispatcher_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -7436,7 +7302,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(4, usePoolDispatcher_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -7471,7 +7337,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getUsePoolDispatcher()
             != other.getUsePoolDispatcher()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -7499,7 +7365,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getUsePoolDispatcher());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -7548,11 +7414,13 @@ public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessag
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -7633,18 +7501,15 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (metricsSelectorBuilder_ == null) {
-          metricsSelector_ = null;
-        } else {
-          metricsSelectorBuilder_.clear();
+        bitField0_ = 0;
+        metricsSelector_ = null;
+        if (metricsSelectorBuilder_ != null) {
+          metricsSelectorBuilder_.dispose();
+          metricsSelectorBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         nrOfInstances_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         routerDispatcher_ = "";
-        bitField0_ = (bitField0_ & ~0x00000004);
         usePoolDispatcher_ = false;
-        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -7671,14 +7536,18 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Adap
       @java.lang.Override
       public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool buildPartial() {
         org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool result = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (metricsSelectorBuilder_ == null) {
-            result.metricsSelector_ = metricsSelector_;
-          } else {
-            result.metricsSelector_ = metricsSelectorBuilder_.build();
-          }
+          result.metricsSelector_ = metricsSelectorBuilder_ == null
+              ? metricsSelector_
+              : metricsSelectorBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
@@ -7686,16 +7555,14 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Adap
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.routerDispatcher_ = routerDispatcher_;
           to_bitField0_ |= 0x00000004;
         }
-        result.routerDispatcher_ = routerDispatcher_;
         if (((from_bitField0_ & 0x00000008) != 0)) {
           result.usePoolDispatcher_ = usePoolDispatcher_;
           to_bitField0_ |= 0x00000008;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -7749,14 +7616,14 @@ public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMe
           setNrOfInstances(other.getNrOfInstances());
         }
         if (other.hasRouterDispatcher()) {
-          bitField0_ |= 0x00000004;
           routerDispatcher_ = other.routerDispatcher_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
         if (other.hasUsePoolDispatcher()) {
           setUsePoolDispatcher(other.getUsePoolDispatcher());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -7782,17 +7649,52 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getMetricsSelectorFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                nrOfInstances_ = input.readUInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 26: {
+                routerDispatcher_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              case 32: {
+                usePoolDispatcher_ = input.readBool();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -7839,11 +7741,11 @@ public Builder setMetricsSelector(org.apache.pekko.cluster.metrics.protobuf.msg.
             throw new NullPointerException();
           }
           metricsSelector_ = value;
-          onChanged();
         } else {
           metricsSelectorBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -7857,11 +7759,11 @@ public Builder setMetricsSelector(
           org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder builderForValue) {
         if (metricsSelectorBuilder_ == null) {
           metricsSelector_ = builderForValue.build();
-          onChanged();
         } else {
           metricsSelectorBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -7874,18 +7776,19 @@ public Builder setMetricsSelector(
       public Builder mergeMetricsSelector(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector value) {
         if (metricsSelectorBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              metricsSelector_ != null &&
-              metricsSelector_ != org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance()) {
-            metricsSelector_ =
-              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.newBuilder(metricsSelector_).mergeFrom(value).buildPartial();
+            metricsSelector_ != null &&
+            metricsSelector_ != org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance()) {
+            getMetricsSelectorBuilder().mergeFrom(value);
           } else {
             metricsSelector_ = value;
           }
-          onChanged();
         } else {
           metricsSelectorBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (metricsSelector_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
@@ -7896,13 +7799,13 @@ public Builder mergeMetricsSelector(org.apache.pekko.cluster.metrics.protobuf.ms
        * optional .MetricsSelector metricsSelector = 1;
        */
       public Builder clearMetricsSelector() {
-        if (metricsSelectorBuilder_ == null) {
-          metricsSelector_ = null;
-          onChanged();
-        } else {
-          metricsSelectorBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        metricsSelector_ = null;
+        if (metricsSelectorBuilder_ != null) {
+          metricsSelectorBuilder_.dispose();
+          metricsSelectorBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -7958,6 +7861,7 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Metr
        * required uint32 nrOfInstances = 2;
        * @return Whether the nrOfInstances field is set.
        */
+      @java.lang.Override
       public boolean hasNrOfInstances() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -7965,6 +7869,7 @@ public boolean hasNrOfInstances() {
        * required uint32 nrOfInstances = 2;
        * @return The nrOfInstances.
        */
+      @java.lang.Override
       public int getNrOfInstances() {
         return nrOfInstances_;
       }
@@ -7974,8 +7879,9 @@ public int getNrOfInstances() {
        * @return This builder for chaining.
        */
       public Builder setNrOfInstances(int value) {
-        bitField0_ |= 0x00000002;
+
         nrOfInstances_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -8056,11 +7962,9 @@ public java.lang.String getRouterDispatcher() {
        */
       public Builder setRouterDispatcher(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         routerDispatcher_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -8073,8 +7977,8 @@ public Builder setRouterDispatcher(
        * @return This builder for chaining.
        */
       public Builder clearRouterDispatcher() {
-        bitField0_ = (bitField0_ & ~0x00000004);
         routerDispatcher_ = getDefaultInstance().getRouterDispatcher();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -8089,11 +7993,9 @@ public Builder clearRouterDispatcher() {
        */
       public Builder setRouterDispatcherBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         routerDispatcher_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -8103,6 +8005,7 @@ public Builder setRouterDispatcherBytes(
        * required bool usePoolDispatcher = 4;
        * @return Whether the usePoolDispatcher field is set.
        */
+      @java.lang.Override
       public boolean hasUsePoolDispatcher() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -8110,6 +8013,7 @@ public boolean hasUsePoolDispatcher() {
        * required bool usePoolDispatcher = 4;
        * @return The usePoolDispatcher.
        */
+      @java.lang.Override
       public boolean getUsePoolDispatcher() {
         return usePoolDispatcher_;
       }
@@ -8119,8 +8023,9 @@ public boolean getUsePoolDispatcher() {
        * @return This builder for chaining.
        */
       public Builder setUsePoolDispatcher(boolean value) {
-        bitField0_ |= 0x00000008;
+
         usePoolDispatcher_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -8167,7 +8072,18 @@ public AdaptiveLoadBalancingPool parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new AdaptiveLoadBalancingPool(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -8237,7 +8153,7 @@ public interface MetricsSelectorOrBuilder extends
    *
    * Protobuf type {@code MetricsSelector}
    */
-  public  static final class MetricsSelector extends
+  public static final class MetricsSelector extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:MetricsSelector)
       MetricsSelectorOrBuilder {
@@ -8258,65 +8174,6 @@ protected java.lang.Object newInstance(
       return new MetricsSelector();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private MetricsSelector(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              serializerId_ = input.readUInt32();
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              manifest_ = bs;
-              break;
-            }
-            case 26: {
-              bitField0_ |= 0x00000004;
-              data_ = input.readBytes();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsSelector_descriptor;
@@ -8332,11 +8189,12 @@ private MetricsSelector(
 
     private int bitField0_;
     public static final int SERIALIZERID_FIELD_NUMBER = 1;
-    private int serializerId_;
+    private int serializerId_ = 0;
     /**
      * required uint32 serializerId = 1;
      * @return Whether the serializerId field is set.
      */
+    @java.lang.Override
     public boolean hasSerializerId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -8344,16 +8202,19 @@ public boolean hasSerializerId() {
      * required uint32 serializerId = 1;
      * @return The serializerId.
      */
+    @java.lang.Override
     public int getSerializerId() {
       return serializerId_;
     }
 
     public static final int MANIFEST_FIELD_NUMBER = 2;
-    private volatile java.lang.Object manifest_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object manifest_ = "";
     /**
      * required string manifest = 2;
      * @return Whether the manifest field is set.
      */
+    @java.lang.Override
     public boolean hasManifest() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -8361,6 +8222,7 @@ public boolean hasManifest() {
      * required string manifest = 2;
      * @return The manifest.
      */
+    @java.lang.Override
     public java.lang.String getManifest() {
       java.lang.Object ref = manifest_;
       if (ref instanceof java.lang.String) {
@@ -8379,6 +8241,7 @@ public java.lang.String getManifest() {
      * required string manifest = 2;
      * @return The bytes for manifest.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getManifestBytes() {
       java.lang.Object ref = manifest_;
@@ -8394,11 +8257,12 @@ public java.lang.String getManifest() {
     }
 
     public static final int DATA_FIELD_NUMBER = 3;
-    private org.apache.pekko.protobufv3.internal.ByteString data_;
+    private org.apache.pekko.protobufv3.internal.ByteString data_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * required bytes data = 3;
      * @return Whether the data field is set.
      */
+    @java.lang.Override
     public boolean hasData() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -8406,6 +8270,7 @@ public boolean hasData() {
      * required bytes data = 3;
      * @return The data.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getData() {
       return data_;
     }
@@ -8445,7 +8310,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeBytes(3, data_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -8465,7 +8330,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(3, data_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -8495,7 +8360,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getData()
             .equals(other.getData())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -8518,7 +8383,7 @@ public int hashCode() {
         hash = (37 * hash) + DATA_FIELD_NUMBER;
         hash = (53 * hash) + getData().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -8567,11 +8432,13 @@ public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessag
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -8639,28 +8506,21 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         serializerId_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000001);
         manifest_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         data_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -8687,6 +8547,12 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Metr
       @java.lang.Override
       public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector buildPartial() {
         org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector result = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -8694,16 +8560,14 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Metr
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.manifest_ = manifest_;
           to_bitField0_ |= 0x00000002;
         }
-        result.manifest_ = manifest_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.data_ = data_;
           to_bitField0_ |= 0x00000004;
         }
-        result.data_ = data_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -8754,14 +8618,14 @@ public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMe
           setSerializerId(other.getSerializerId());
         }
         if (other.hasManifest()) {
-          bitField0_ |= 0x00000002;
           manifest_ = other.manifest_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasData()) {
           setData(other.getData());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -8785,17 +8649,45 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                serializerId_ = input.readUInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 18: {
+                manifest_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 26: {
+                data_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -8805,6 +8697,7 @@ public Builder mergeFrom(
        * required uint32 serializerId = 1;
        * @return Whether the serializerId field is set.
        */
+      @java.lang.Override
       public boolean hasSerializerId() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -8812,6 +8705,7 @@ public boolean hasSerializerId() {
        * required uint32 serializerId = 1;
        * @return The serializerId.
        */
+      @java.lang.Override
       public int getSerializerId() {
         return serializerId_;
       }
@@ -8821,8 +8715,9 @@ public int getSerializerId() {
        * @return This builder for chaining.
        */
       public Builder setSerializerId(int value) {
-        bitField0_ |= 0x00000001;
+
         serializerId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8887,11 +8782,9 @@ public java.lang.String getManifest() {
        */
       public Builder setManifest(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         manifest_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -8900,8 +8793,8 @@ public Builder setManifest(
        * @return This builder for chaining.
        */
       public Builder clearManifest() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         manifest_ = getDefaultInstance().getManifest();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -8912,11 +8805,9 @@ public Builder clearManifest() {
        */
       public Builder setManifestBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         manifest_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -8926,6 +8817,7 @@ public Builder setManifestBytes(
        * required bytes data = 3;
        * @return Whether the data field is set.
        */
+      @java.lang.Override
       public boolean hasData() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -8933,6 +8825,7 @@ public boolean hasData() {
        * required bytes data = 3;
        * @return The data.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getData() {
         return data_;
       }
@@ -8942,11 +8835,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getData() {
        * @return This builder for chaining.
        */
       public Builder setData(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         data_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -8993,7 +8884,18 @@ public MetricsSelector parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new MetricsSelector(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -9044,7 +8946,7 @@ org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSele
   /**
    * Protobuf type {@code MixMetricsSelector}
    */
-  public  static final class MixMetricsSelector extends
+  public static final class MixMetricsSelector extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:MixMetricsSelector)
       MixMetricsSelectorOrBuilder {
@@ -9064,61 +8966,6 @@ protected java.lang.Object newInstance(
       return new MixMetricsSelector();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private MixMetricsSelector(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                selectors_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              selectors_.add(
-                  input.readMessage(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          selectors_ = java.util.Collections.unmodifiableList(selectors_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MixMetricsSelector_descriptor;
@@ -9133,16 +8980,19 @@ private MixMetricsSelector(
     }
 
     public static final int SELECTORS_FIELD_NUMBER = 1;
+    @SuppressWarnings("serial")
     private java.util.List selectors_;
     /**
      * repeated .MetricsSelector selectors = 1;
      */
+    @java.lang.Override
     public java.util.List getSelectorsList() {
       return selectors_;
     }
     /**
      * repeated .MetricsSelector selectors = 1;
      */
+    @java.lang.Override
     public java.util.List 
         getSelectorsOrBuilderList() {
       return selectors_;
@@ -9150,18 +9000,21 @@ public java.util.Listrepeated .MetricsSelector selectors = 1;
      */
+    @java.lang.Override
     public int getSelectorsCount() {
       return selectors_.size();
     }
     /**
      * repeated .MetricsSelector selectors = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector getSelectors(int index) {
       return selectors_.get(index);
     }
     /**
      * repeated .MetricsSelector selectors = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder getSelectorsOrBuilder(
         int index) {
       return selectors_.get(index);
@@ -9190,7 +9043,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < selectors_.size(); i++) {
         output.writeMessage(1, selectors_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -9203,7 +9056,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, selectors_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -9220,7 +9073,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getSelectorsList()
           .equals(other.getSelectorsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -9235,7 +9088,7 @@ public int hashCode() {
         hash = (37 * hash) + SELECTORS_FIELD_NUMBER;
         hash = (53 * hash) + getSelectorsList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -9284,11 +9137,13 @@ public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessag
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -9352,29 +9207,25 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getSelectorsFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (selectorsBuilder_ == null) {
           selectors_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
+          selectors_ = null;
           selectorsBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -9401,7 +9252,13 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixM
       @java.lang.Override
       public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector buildPartial() {
         org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector result = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector(this);
-        int from_bitField0_ = bitField0_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector result) {
         if (selectorsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             selectors_ = java.util.Collections.unmodifiableList(selectors_);
@@ -9411,8 +9268,10 @@ public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixM
         } else {
           result.selectors_ = selectorsBuilder_.build();
         }
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector result) {
+        int from_bitField0_ = bitField0_;
       }
 
       @java.lang.Override
@@ -9485,7 +9344,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMe
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -9505,17 +9364,43 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.PARSER,
+                        extensionRegistry);
+                if (selectorsBuilder_ == null) {
+                  ensureSelectorsIsMutable();
+                  selectors_.add(m);
+                } else {
+                  selectorsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -9792,7 +9677,18 @@ public MixMetricsSelector parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new MixMetricsSelector(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
diff --git a/cluster-sharding-typed/src/main/java/org/apache/pekko/cluster/sharding/typed/internal/protobuf/ShardingMessages.java b/cluster-sharding-typed/src/main/java/org/apache/pekko/cluster/sharding/typed/internal/protobuf/ShardingMessages.java
index e7041499f88..79188b10185 100644
--- a/cluster-sharding-typed/src/main/java/org/apache/pekko/cluster/sharding/typed/internal/protobuf/ShardingMessages.java
+++ b/cluster-sharding-typed/src/main/java/org/apache/pekko/cluster/sharding/typed/internal/protobuf/ShardingMessages.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2020-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ShardingMessages.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.cluster.sharding.typed.internal.protobuf;
 
 public final class ShardingMessages {
@@ -66,7 +67,7 @@ public interface ShardingEnvelopeOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.sharding.typed.ShardingEnvelope}
    */
-  public  static final class ShardingEnvelope extends
+  public static final class ShardingEnvelope extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.sharding.typed.ShardingEnvelope)
       ShardingEnvelopeOrBuilder {
@@ -86,68 +87,6 @@ protected java.lang.Object newInstance(
       return new ShardingEnvelope();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ShardingEnvelope(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              entityId_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = message_.toBuilder();
-              }
-              message_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(message_);
-                message_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_org_apache_pekko_cluster_sharding_typed_ShardingEnvelope_descriptor;
@@ -163,11 +102,13 @@ private ShardingEnvelope(
 
     private int bitField0_;
     public static final int ENTITYID_FIELD_NUMBER = 1;
-    private volatile java.lang.Object entityId_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object entityId_ = "";
     /**
      * required string entityId = 1;
      * @return Whether the entityId field is set.
      */
+    @java.lang.Override
     public boolean hasEntityId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -175,6 +116,7 @@ public boolean hasEntityId() {
      * required string entityId = 1;
      * @return The entityId.
      */
+    @java.lang.Override
     public java.lang.String getEntityId() {
       java.lang.Object ref = entityId_;
       if (ref instanceof java.lang.String) {
@@ -193,6 +135,7 @@ public java.lang.String getEntityId() {
      * required string entityId = 1;
      * @return The bytes for entityId.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdBytes() {
       java.lang.Object ref = entityId_;
@@ -213,6 +156,7 @@ public java.lang.String getEntityId() {
      * required .Payload message = 2;
      * @return Whether the message field is set.
      */
+    @java.lang.Override
     public boolean hasMessage() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -220,12 +164,14 @@ public boolean hasMessage() {
      * required .Payload message = 2;
      * @return The message.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.Payload getMessage() {
       return message_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
     }
     /**
      * required .Payload message = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder() {
       return message_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
     }
@@ -262,7 +208,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getMessage());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -278,7 +224,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getMessage());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -303,7 +249,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getMessage()
             .equals(other.getMessage())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -322,7 +268,7 @@ public int hashCode() {
         hash = (37 * hash) + MESSAGE_FIELD_NUMBER;
         hash = (53 * hash) + getMessage().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -371,11 +317,13 @@ public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.Sharding
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -456,14 +404,13 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         entityId_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (messageBuilder_ == null) {
-          message_ = null;
-        } else {
-          messageBuilder_.clear();
+        message_ = null;
+        if (messageBuilder_ != null) {
+          messageBuilder_.dispose();
+          messageBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -490,23 +437,25 @@ public org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessage
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope buildPartial() {
         org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope result = new org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.entityId_ = entityId_;
           to_bitField0_ |= 0x00000001;
         }
-        result.entityId_ = entityId_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (messageBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = messageBuilder_.build();
-          }
+          result.message_ = messageBuilder_ == null
+              ? message_
+              : messageBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -554,14 +503,14 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope other) {
         if (other == org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope.getDefaultInstance()) return this;
         if (other.hasEntityId()) {
-          bitField0_ |= 0x00000001;
           entityId_ = other.entityId_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasMessage()) {
           mergeMessage(other.getMessage());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -585,17 +534,42 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                entityId_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -650,11 +624,9 @@ public java.lang.String getEntityId() {
        */
       public Builder setEntityId(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         entityId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -663,8 +635,8 @@ public Builder setEntityId(
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         entityId_ = getDefaultInstance().getEntityId();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -675,11 +647,9 @@ public Builder clearEntityId() {
        */
       public Builder setEntityIdBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         entityId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -714,11 +684,11 @@ public Builder setMessage(org.apache.pekko.remote.ContainerFormats.Payload value
             throw new NullPointerException();
           }
           message_ = value;
-          onChanged();
         } else {
           messageBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -728,11 +698,11 @@ public Builder setMessage(
           org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (messageBuilder_ == null) {
           message_ = builderForValue.build();
-          onChanged();
         } else {
           messageBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -741,31 +711,32 @@ public Builder setMessage(
       public Builder mergeMessage(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (messageBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              message_ != null &&
-              message_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
-            message_ =
-              org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(message_).mergeFrom(value).buildPartial();
+            message_ != null &&
+            message_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
+            getMessageBuilder().mergeFrom(value);
           } else {
             message_ = value;
           }
-          onChanged();
         } else {
           messageBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (message_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Payload message = 2;
        */
       public Builder clearMessage() {
-        if (messageBuilder_ == null) {
-          message_ = null;
-          onChanged();
-        } else {
-          messageBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        message_ = null;
+        if (messageBuilder_ != null) {
+          messageBuilder_.dispose();
+          messageBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -836,7 +807,18 @@ public ShardingEnvelope parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ShardingEnvelope(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
diff --git a/cluster-sharding/src/main/java/org/apache/pekko/cluster/sharding/protobuf/msg/ClusterShardingMessages.java b/cluster-sharding/src/main/java/org/apache/pekko/cluster/sharding/protobuf/msg/ClusterShardingMessages.java
index 1e8c40abb93..aca9fbdb43e 100644
--- a/cluster-sharding/src/main/java/org/apache/pekko/cluster/sharding/protobuf/msg/ClusterShardingMessages.java
+++ b/cluster-sharding/src/main/java/org/apache/pekko/cluster/sharding/protobuf/msg/ClusterShardingMessages.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2021-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ClusterShardingMessages.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.cluster.sharding.protobuf.msg;
 
 public final class ClusterShardingMessages {
@@ -133,7 +134,7 @@ org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Coordinat
   /**
    * Protobuf type {@code CoordinatorState}
    */
-  public  static final class CoordinatorState extends
+  public static final class CoordinatorState extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:CoordinatorState)
       CoordinatorStateOrBuilder {
@@ -144,9 +145,12 @@ private CoordinatorState(org.apache.pekko.protobufv3.internal.GeneratedMessageV3
     }
     private CoordinatorState() {
       shards_ = java.util.Collections.emptyList();
-      regions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-      regionProxies_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-      unallocatedShards_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      regions_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      regionProxies_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      unallocatedShards_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -156,97 +160,6 @@ protected java.lang.Object newInstance(
       return new CoordinatorState();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private CoordinatorState(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                shards_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              shards_.add(
-                  input.readMessage(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.PARSER, extensionRegistry));
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                regions_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              regions_.add(bs);
-              break;
-            }
-            case 26: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                regionProxies_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              regionProxies_.add(bs);
-              break;
-            }
-            case 34: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                unallocatedShards_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              unallocatedShards_.add(bs);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          shards_ = java.util.Collections.unmodifiableList(shards_);
-        }
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          regions_ = regions_.getUnmodifiableView();
-        }
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          regionProxies_ = regionProxies_.getUnmodifiableView();
-        }
-        if (((mutable_bitField0_ & 0x00000008) != 0)) {
-          unallocatedShards_ = unallocatedShards_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_descriptor;
@@ -301,7 +214,7 @@ public interface ShardEntryOrBuilder extends
     /**
      * Protobuf type {@code CoordinatorState.ShardEntry}
      */
-    public  static final class ShardEntry extends
+    public static final class ShardEntry extends
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:CoordinatorState.ShardEntry)
         ShardEntryOrBuilder {
@@ -322,61 +235,6 @@ protected java.lang.Object newInstance(
         return new ShardEntry();
       }
 
-      @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private ShardEntry(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10: {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000001;
-                shardId_ = bs;
-                break;
-              }
-              case 18: {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000002;
-                regionRef_ = bs;
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_ShardEntry_descriptor;
@@ -392,11 +250,13 @@ private ShardEntry(
 
       private int bitField0_;
       public static final int SHARDID_FIELD_NUMBER = 1;
-      private volatile java.lang.Object shardId_;
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object shardId_ = "";
       /**
        * required string shardId = 1;
        * @return Whether the shardId field is set.
        */
+      @java.lang.Override
       public boolean hasShardId() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -404,6 +264,7 @@ public boolean hasShardId() {
        * required string shardId = 1;
        * @return The shardId.
        */
+      @java.lang.Override
       public java.lang.String getShardId() {
         java.lang.Object ref = shardId_;
         if (ref instanceof java.lang.String) {
@@ -422,6 +283,7 @@ public java.lang.String getShardId() {
        * required string shardId = 1;
        * @return The bytes for shardId.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString
           getShardIdBytes() {
         java.lang.Object ref = shardId_;
@@ -437,11 +299,13 @@ public java.lang.String getShardId() {
       }
 
       public static final int REGIONREF_FIELD_NUMBER = 2;
-      private volatile java.lang.Object regionRef_;
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object regionRef_ = "";
       /**
        * required string regionRef = 2;
        * @return Whether the regionRef field is set.
        */
+      @java.lang.Override
       public boolean hasRegionRef() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -449,6 +313,7 @@ public boolean hasRegionRef() {
        * required string regionRef = 2;
        * @return The regionRef.
        */
+      @java.lang.Override
       public java.lang.String getRegionRef() {
         java.lang.Object ref = regionRef_;
         if (ref instanceof java.lang.String) {
@@ -467,6 +332,7 @@ public java.lang.String getRegionRef() {
        * required string regionRef = 2;
        * @return The bytes for regionRef.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString
           getRegionRefBytes() {
         java.lang.Object ref = regionRef_;
@@ -509,7 +375,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         if (((bitField0_ & 0x00000002) != 0)) {
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, regionRef_);
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -524,7 +390,7 @@ public int getSerializedSize() {
         if (((bitField0_ & 0x00000002) != 0)) {
           size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, regionRef_);
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -549,7 +415,7 @@ public boolean equals(final java.lang.Object obj) {
           if (!getRegionRef()
               .equals(other.getRegionRef())) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -568,7 +434,7 @@ public int hashCode() {
           hash = (37 * hash) + REGIONREF_FIELD_NUMBER;
           hash = (53 * hash) + getRegionRef().hashCode();
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -617,11 +483,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
+
       public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
+
       public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseDelimitedFrom(
           java.io.InputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -685,26 +553,20 @@ public static final class Builder extends
 
         // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.newBuilder()
         private Builder() {
-          maybeForceBuilderInitialization();
+
         }
 
         private Builder(
             org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
-          maybeForceBuilderInitialization();
-        }
-        private void maybeForceBuilderInitialization() {
-          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                  .alwaysUseFieldBuilders) {
-          }
+
         }
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           shardId_ = "";
-          bitField0_ = (bitField0_ & ~0x00000001);
           regionRef_ = "";
-          bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
@@ -731,19 +593,23 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Co
         @java.lang.Override
         public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry buildPartial() {
           org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.shardId_ = shardId_;
             to_bitField0_ |= 0x00000001;
           }
-          result.shardId_ = shardId_;
           if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.regionRef_ = regionRef_;
             to_bitField0_ |= 0x00000002;
           }
-          result.regionRef_ = regionRef_;
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -791,16 +657,16 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
         public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry other) {
           if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.getDefaultInstance()) return this;
           if (other.hasShardId()) {
-            bitField0_ |= 0x00000001;
             shardId_ = other.shardId_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (other.hasRegionRef()) {
-            bitField0_ |= 0x00000002;
             regionRef_ = other.regionRef_;
+            bitField0_ |= 0x00000002;
             onChanged();
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -821,17 +687,40 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 10: {
+                  shardId_ = input.readBytes();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+                case 18: {
+                  regionRef_ = input.readBytes();
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
         private int bitField0_;
@@ -886,11 +775,9 @@ public java.lang.String getShardId() {
          */
         public Builder setShardId(
             java.lang.String value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+          if (value == null) { throw new NullPointerException(); }
           shardId_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -899,8 +786,8 @@ public Builder setShardId(
          * @return This builder for chaining.
          */
         public Builder clearShardId() {
-          bitField0_ = (bitField0_ & ~0x00000001);
           shardId_ = getDefaultInstance().getShardId();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -911,11 +798,9 @@ public Builder clearShardId() {
          */
         public Builder setShardIdBytes(
             org.apache.pekko.protobufv3.internal.ByteString value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+          if (value == null) { throw new NullPointerException(); }
           shardId_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -970,11 +855,9 @@ public java.lang.String getRegionRef() {
          */
         public Builder setRegionRef(
             java.lang.String value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+          if (value == null) { throw new NullPointerException(); }
           regionRef_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -983,8 +866,8 @@ public Builder setRegionRef(
          * @return This builder for chaining.
          */
         public Builder clearRegionRef() {
-          bitField0_ = (bitField0_ & ~0x00000002);
           regionRef_ = getDefaultInstance().getRegionRef();
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -995,11 +878,9 @@ public Builder clearRegionRef() {
          */
         public Builder setRegionRefBytes(
             org.apache.pekko.protobufv3.internal.ByteString value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+          if (value == null) { throw new NullPointerException(); }
           regionRef_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -1036,7 +917,18 @@ public ShardEntry parsePartialFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-          return new ShardEntry(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
@@ -1057,16 +949,19 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Co
     }
 
     public static final int SHARDS_FIELD_NUMBER = 1;
+    @SuppressWarnings("serial")
     private java.util.List shards_;
     /**
      * repeated .CoordinatorState.ShardEntry shards = 1;
      */
+    @java.lang.Override
     public java.util.List getShardsList() {
       return shards_;
     }
     /**
      * repeated .CoordinatorState.ShardEntry shards = 1;
      */
+    @java.lang.Override
     public java.util.List 
         getShardsOrBuilderList() {
       return shards_;
@@ -1074,25 +969,30 @@ public java.util.Listrepeated .CoordinatorState.ShardEntry shards = 1;
      */
+    @java.lang.Override
     public int getShardsCount() {
       return shards_.size();
     }
     /**
      * repeated .CoordinatorState.ShardEntry shards = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry getShards(int index) {
       return shards_.get(index);
     }
     /**
      * repeated .CoordinatorState.ShardEntry shards = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntryOrBuilder getShardsOrBuilder(
         int index) {
       return shards_.get(index);
     }
 
     public static final int REGIONS_FIELD_NUMBER = 2;
-    private org.apache.pekko.protobufv3.internal.LazyStringList regions_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList regions_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string regions = 2;
      * @return A list containing the regions.
@@ -1127,7 +1027,9 @@ public java.lang.String getRegions(int index) {
     }
 
     public static final int REGIONPROXIES_FIELD_NUMBER = 3;
-    private org.apache.pekko.protobufv3.internal.LazyStringList regionProxies_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList regionProxies_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string regionProxies = 3;
      * @return A list containing the regionProxies.
@@ -1162,7 +1064,9 @@ public java.lang.String getRegionProxies(int index) {
     }
 
     public static final int UNALLOCATEDSHARDS_FIELD_NUMBER = 4;
-    private org.apache.pekko.protobufv3.internal.LazyStringList unallocatedShards_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList unallocatedShards_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string unallocatedShards = 4;
      * @return A list containing the unallocatedShards.
@@ -1228,7 +1132,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < unallocatedShards_.size(); i++) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, unallocatedShards_.getRaw(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -1265,7 +1169,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getUnallocatedShardsList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1288,7 +1192,7 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getRegionProxiesList())) return false;
       if (!getUnallocatedShardsList()
           .equals(other.getUnallocatedShardsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1315,7 +1219,7 @@ public int hashCode() {
         hash = (37 * hash) + UNALLOCATEDSHARDS_FIELD_NUMBER;
         hash = (53 * hash) + getUnallocatedShardsList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1364,11 +1268,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -1432,35 +1338,31 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getShardsFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (shardsBuilder_ == null) {
           shards_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
+          shards_ = null;
           shardsBuilder_.clear();
         }
-        regions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        regionProxies_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        unallocatedShards_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000001);
+        regions_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        regionProxies_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        unallocatedShards_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         return this;
       }
 
@@ -1487,7 +1389,13 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Co
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState(this);
-        int from_bitField0_ = bitField0_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState result) {
         if (shardsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             shards_ = java.util.Collections.unmodifiableList(shards_);
@@ -1497,23 +1405,22 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Co
         } else {
           result.shards_ = shardsBuilder_.build();
         }
-        if (((bitField0_ & 0x00000002) != 0)) {
-          regions_ = regions_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000002);
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          regions_.makeImmutable();
+          result.regions_ = regions_;
         }
-        result.regions_ = regions_;
-        if (((bitField0_ & 0x00000004) != 0)) {
-          regionProxies_ = regionProxies_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000004);
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          regionProxies_.makeImmutable();
+          result.regionProxies_ = regionProxies_;
         }
-        result.regionProxies_ = regionProxies_;
-        if (((bitField0_ & 0x00000008) != 0)) {
-          unallocatedShards_ = unallocatedShards_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000008);
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          unallocatedShards_.makeImmutable();
+          result.unallocatedShards_ = unallocatedShards_;
         }
-        result.unallocatedShards_ = unallocatedShards_;
-        onBuilt();
-        return result;
       }
 
       @java.lang.Override
@@ -1589,7 +1496,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterS
         if (!other.regions_.isEmpty()) {
           if (regions_.isEmpty()) {
             regions_ = other.regions_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ |= 0x00000002;
           } else {
             ensureRegionsIsMutable();
             regions_.addAll(other.regions_);
@@ -1599,7 +1506,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterS
         if (!other.regionProxies_.isEmpty()) {
           if (regionProxies_.isEmpty()) {
             regionProxies_ = other.regionProxies_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ |= 0x00000004;
           } else {
             ensureRegionProxiesIsMutable();
             regionProxies_.addAll(other.regionProxies_);
@@ -1609,14 +1516,14 @@ public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterS
         if (!other.unallocatedShards_.isEmpty()) {
           if (unallocatedShards_.isEmpty()) {
             unallocatedShards_ = other.unallocatedShards_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ |= 0x00000008;
           } else {
             ensureUnallocatedShardsIsMutable();
             unallocatedShards_.addAll(other.unallocatedShards_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1636,17 +1543,61 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.PARSER,
+                        extensionRegistry);
+                if (shardsBuilder_ == null) {
+                  ensureShardsIsMutable();
+                  shards_.add(m);
+                } else {
+                  shardsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+              case 18: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureRegionsIsMutable();
+                regions_.add(bs);
+                break;
+              } // case 18
+              case 26: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureRegionProxiesIsMutable();
+                regionProxies_.add(bs);
+                break;
+              } // case 26
+              case 34: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureUnallocatedShardsIsMutable();
+                unallocatedShards_.add(bs);
+                break;
+              } // case 34
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -1891,12 +1842,13 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Co
         return shardsBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList regions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList regions_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureRegionsIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!regions_.isModifiable()) {
           regions_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(regions_);
-          bitField0_ |= 0x00000002;
-         }
+        }
+        bitField0_ |= 0x00000002;
       }
       /**
        * repeated string regions = 2;
@@ -1904,7 +1856,8 @@ private void ensureRegionsIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getRegionsList() {
-        return regions_.getUnmodifiableView();
+        regions_.makeImmutable();
+        return regions_;
       }
       /**
        * repeated string regions = 2;
@@ -1938,11 +1891,10 @@ public java.lang.String getRegions(int index) {
        */
       public Builder setRegions(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureRegionsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureRegionsIsMutable();
         regions_.set(index, value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1953,11 +1905,10 @@ public Builder setRegions(
        */
       public Builder addRegions(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureRegionsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureRegionsIsMutable();
         regions_.add(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1971,6 +1922,7 @@ public Builder addAllRegions(
         ensureRegionsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, regions_);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1979,8 +1931,9 @@ public Builder addAllRegions(
        * @return This builder for chaining.
        */
       public Builder clearRegions() {
-        regions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        regions_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);;
         onChanged();
         return this;
       }
@@ -1991,21 +1944,21 @@ public Builder clearRegions() {
        */
       public Builder addRegionsBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureRegionsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureRegionsIsMutable();
         regions_.add(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList regionProxies_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList regionProxies_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureRegionProxiesIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
+        if (!regionProxies_.isModifiable()) {
           regionProxies_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(regionProxies_);
-          bitField0_ |= 0x00000004;
-         }
+        }
+        bitField0_ |= 0x00000004;
       }
       /**
        * repeated string regionProxies = 3;
@@ -2013,7 +1966,8 @@ private void ensureRegionProxiesIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getRegionProxiesList() {
-        return regionProxies_.getUnmodifiableView();
+        regionProxies_.makeImmutable();
+        return regionProxies_;
       }
       /**
        * repeated string regionProxies = 3;
@@ -2047,11 +2001,10 @@ public java.lang.String getRegionProxies(int index) {
        */
       public Builder setRegionProxies(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureRegionProxiesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureRegionProxiesIsMutable();
         regionProxies_.set(index, value);
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -2062,11 +2015,10 @@ public Builder setRegionProxies(
        */
       public Builder addRegionProxies(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureRegionProxiesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureRegionProxiesIsMutable();
         regionProxies_.add(value);
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -2080,6 +2032,7 @@ public Builder addAllRegionProxies(
         ensureRegionProxiesIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, regionProxies_);
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -2088,8 +2041,9 @@ public Builder addAllRegionProxies(
        * @return This builder for chaining.
        */
       public Builder clearRegionProxies() {
-        regionProxies_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        regionProxies_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000004);;
         onChanged();
         return this;
       }
@@ -2100,21 +2054,21 @@ public Builder clearRegionProxies() {
        */
       public Builder addRegionProxiesBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureRegionProxiesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureRegionProxiesIsMutable();
         regionProxies_.add(value);
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList unallocatedShards_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList unallocatedShards_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureUnallocatedShardsIsMutable() {
-        if (!((bitField0_ & 0x00000008) != 0)) {
+        if (!unallocatedShards_.isModifiable()) {
           unallocatedShards_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(unallocatedShards_);
-          bitField0_ |= 0x00000008;
-         }
+        }
+        bitField0_ |= 0x00000008;
       }
       /**
        * repeated string unallocatedShards = 4;
@@ -2122,7 +2076,8 @@ private void ensureUnallocatedShardsIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getUnallocatedShardsList() {
-        return unallocatedShards_.getUnmodifiableView();
+        unallocatedShards_.makeImmutable();
+        return unallocatedShards_;
       }
       /**
        * repeated string unallocatedShards = 4;
@@ -2156,11 +2111,10 @@ public java.lang.String getUnallocatedShards(int index) {
        */
       public Builder setUnallocatedShards(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureUnallocatedShardsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureUnallocatedShardsIsMutable();
         unallocatedShards_.set(index, value);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -2171,11 +2125,10 @@ public Builder setUnallocatedShards(
        */
       public Builder addUnallocatedShards(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureUnallocatedShardsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureUnallocatedShardsIsMutable();
         unallocatedShards_.add(value);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -2189,6 +2142,7 @@ public Builder addAllUnallocatedShards(
         ensureUnallocatedShardsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, unallocatedShards_);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -2197,8 +2151,9 @@ public Builder addAllUnallocatedShards(
        * @return This builder for chaining.
        */
       public Builder clearUnallocatedShards() {
-        unallocatedShards_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        unallocatedShards_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000008);;
         onChanged();
         return this;
       }
@@ -2209,11 +2164,10 @@ public Builder clearUnallocatedShards() {
        */
       public Builder addUnallocatedShardsBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureUnallocatedShardsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureUnallocatedShardsIsMutable();
         unallocatedShards_.add(value);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -2250,7 +2204,18 @@ public CoordinatorState parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new CoordinatorState(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -2294,7 +2259,7 @@ public interface ActorRefMessageOrBuilder extends
   /**
    * Protobuf type {@code ActorRefMessage}
    */
-  public  static final class ActorRefMessage extends
+  public static final class ActorRefMessage extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ActorRefMessage)
       ActorRefMessageOrBuilder {
@@ -2314,55 +2279,6 @@ protected java.lang.Object newInstance(
       return new ActorRefMessage();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ActorRefMessage(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              ref_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ActorRefMessage_descriptor;
@@ -2378,11 +2294,13 @@ private ActorRefMessage(
 
     private int bitField0_;
     public static final int REF_FIELD_NUMBER = 1;
-    private volatile java.lang.Object ref_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object ref_ = "";
     /**
      * required string ref = 1;
      * @return Whether the ref field is set.
      */
+    @java.lang.Override
     public boolean hasRef() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -2390,6 +2308,7 @@ public boolean hasRef() {
      * required string ref = 1;
      * @return The ref.
      */
+    @java.lang.Override
     public java.lang.String getRef() {
       java.lang.Object ref = ref_;
       if (ref instanceof java.lang.String) {
@@ -2408,6 +2327,7 @@ public java.lang.String getRef() {
      * required string ref = 1;
      * @return The bytes for ref.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getRefBytes() {
       java.lang.Object ref = ref_;
@@ -2443,7 +2363,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, ref_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -2455,7 +2375,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000001) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, ref_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2475,7 +2395,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getRef()
             .equals(other.getRef())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -2490,7 +2410,7 @@ public int hashCode() {
         hash = (37 * hash) + REF_FIELD_NUMBER;
         hash = (53 * hash) + getRef().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -2539,11 +2459,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -2607,24 +2529,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         ref_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -2651,15 +2568,19 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Ac
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.ref_ = ref_;
           to_bitField0_ |= 0x00000001;
         }
-        result.ref_ = ref_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -2707,11 +2628,11 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage other) {
         if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage.getDefaultInstance()) return this;
         if (other.hasRef()) {
-          bitField0_ |= 0x00000001;
           ref_ = other.ref_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -2729,20 +2650,38 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
         }
-        return this;
-      }
-      private int bitField0_;
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                ref_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
+        } finally {
+          onChanged();
+        } // finally
+        return this;
+      }
+      private int bitField0_;
 
       private java.lang.Object ref_ = "";
       /**
@@ -2794,11 +2733,9 @@ public java.lang.String getRef() {
        */
       public Builder setRef(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         ref_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2807,8 +2744,8 @@ public Builder setRef(
        * @return This builder for chaining.
        */
       public Builder clearRef() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         ref_ = getDefaultInstance().getRef();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -2819,11 +2756,9 @@ public Builder clearRef() {
        */
       public Builder setRefBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         ref_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2860,7 +2795,18 @@ public ActorRefMessage parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ActorRefMessage(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -2904,7 +2850,7 @@ public interface ShardIdMessageOrBuilder extends
   /**
    * Protobuf type {@code ShardIdMessage}
    */
-  public  static final class ShardIdMessage extends
+  public static final class ShardIdMessage extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ShardIdMessage)
       ShardIdMessageOrBuilder {
@@ -2924,55 +2870,6 @@ protected java.lang.Object newInstance(
       return new ShardIdMessage();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ShardIdMessage(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              shard_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardIdMessage_descriptor;
@@ -2988,11 +2885,13 @@ private ShardIdMessage(
 
     private int bitField0_;
     public static final int SHARD_FIELD_NUMBER = 1;
-    private volatile java.lang.Object shard_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object shard_ = "";
     /**
      * required string shard = 1;
      * @return Whether the shard field is set.
      */
+    @java.lang.Override
     public boolean hasShard() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -3000,6 +2899,7 @@ public boolean hasShard() {
      * required string shard = 1;
      * @return The shard.
      */
+    @java.lang.Override
     public java.lang.String getShard() {
       java.lang.Object ref = shard_;
       if (ref instanceof java.lang.String) {
@@ -3018,6 +2918,7 @@ public java.lang.String getShard() {
      * required string shard = 1;
      * @return The bytes for shard.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getShardBytes() {
       java.lang.Object ref = shard_;
@@ -3053,7 +2954,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, shard_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -3065,7 +2966,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000001) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, shard_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -3085,7 +2986,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getShard()
             .equals(other.getShard())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -3100,7 +3001,7 @@ public int hashCode() {
         hash = (37 * hash) + SHARD_FIELD_NUMBER;
         hash = (53 * hash) + getShard().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3149,11 +3050,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -3217,24 +3120,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         shard_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -3261,15 +3159,19 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Sh
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.shard_ = shard_;
           to_bitField0_ |= 0x00000001;
         }
-        result.shard_ = shard_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -3317,11 +3219,11 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage other) {
         if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage.getDefaultInstance()) return this;
         if (other.hasShard()) {
-          bitField0_ |= 0x00000001;
           shard_ = other.shard_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -3339,17 +3241,35 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                shard_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -3404,11 +3324,9 @@ public java.lang.String getShard() {
        */
       public Builder setShard(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         shard_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -3417,8 +3335,8 @@ public Builder setShard(
        * @return This builder for chaining.
        */
       public Builder clearShard() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         shard_ = getDefaultInstance().getShard();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -3429,11 +3347,9 @@ public Builder clearShard() {
        */
       public Builder setShardBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         shard_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -3470,7 +3386,18 @@ public ShardIdMessage parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ShardIdMessage(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -3531,7 +3458,7 @@ public interface ShardHomeAllocatedOrBuilder extends
   /**
    * Protobuf type {@code ShardHomeAllocated}
    */
-  public  static final class ShardHomeAllocated extends
+  public static final class ShardHomeAllocated extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ShardHomeAllocated)
       ShardHomeAllocatedOrBuilder {
@@ -3552,61 +3479,6 @@ protected java.lang.Object newInstance(
       return new ShardHomeAllocated();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ShardHomeAllocated(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              shard_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              region_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomeAllocated_descriptor;
@@ -3622,11 +3494,13 @@ private ShardHomeAllocated(
 
     private int bitField0_;
     public static final int SHARD_FIELD_NUMBER = 1;
-    private volatile java.lang.Object shard_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object shard_ = "";
     /**
      * required string shard = 1;
      * @return Whether the shard field is set.
      */
+    @java.lang.Override
     public boolean hasShard() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -3634,6 +3508,7 @@ public boolean hasShard() {
      * required string shard = 1;
      * @return The shard.
      */
+    @java.lang.Override
     public java.lang.String getShard() {
       java.lang.Object ref = shard_;
       if (ref instanceof java.lang.String) {
@@ -3652,6 +3527,7 @@ public java.lang.String getShard() {
      * required string shard = 1;
      * @return The bytes for shard.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getShardBytes() {
       java.lang.Object ref = shard_;
@@ -3667,11 +3543,13 @@ public java.lang.String getShard() {
     }
 
     public static final int REGION_FIELD_NUMBER = 2;
-    private volatile java.lang.Object region_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object region_ = "";
     /**
      * required string region = 2;
      * @return Whether the region field is set.
      */
+    @java.lang.Override
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -3679,6 +3557,7 @@ public boolean hasRegion() {
      * required string region = 2;
      * @return The region.
      */
+    @java.lang.Override
     public java.lang.String getRegion() {
       java.lang.Object ref = region_;
       if (ref instanceof java.lang.String) {
@@ -3697,6 +3576,7 @@ public java.lang.String getRegion() {
      * required string region = 2;
      * @return The bytes for region.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getRegionBytes() {
       java.lang.Object ref = region_;
@@ -3739,7 +3619,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, region_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -3754,7 +3634,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000002) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, region_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -3779,7 +3659,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getRegion()
             .equals(other.getRegion())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -3798,7 +3678,7 @@ public int hashCode() {
         hash = (37 * hash) + REGION_FIELD_NUMBER;
         hash = (53 * hash) + getRegion().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3847,11 +3727,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -3915,26 +3797,20 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         shard_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         region_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -3961,19 +3837,23 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Sh
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.shard_ = shard_;
           to_bitField0_ |= 0x00000001;
         }
-        result.shard_ = shard_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.region_ = region_;
           to_bitField0_ |= 0x00000002;
         }
-        result.region_ = region_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -4021,16 +3901,16 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated other) {
         if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated.getDefaultInstance()) return this;
         if (other.hasShard()) {
-          bitField0_ |= 0x00000001;
           shard_ = other.shard_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasRegion()) {
-          bitField0_ |= 0x00000002;
           region_ = other.region_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -4051,17 +3931,40 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                shard_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                region_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -4116,11 +4019,9 @@ public java.lang.String getShard() {
        */
       public Builder setShard(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         shard_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4129,8 +4030,8 @@ public Builder setShard(
        * @return This builder for chaining.
        */
       public Builder clearShard() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         shard_ = getDefaultInstance().getShard();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -4141,11 +4042,9 @@ public Builder clearShard() {
        */
       public Builder setShardBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         shard_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4200,11 +4099,9 @@ public java.lang.String getRegion() {
        */
       public Builder setRegion(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         region_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4213,8 +4110,8 @@ public Builder setRegion(
        * @return This builder for chaining.
        */
       public Builder clearRegion() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         region_ = getDefaultInstance().getRegion();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -4225,11 +4122,9 @@ public Builder clearRegion() {
        */
       public Builder setRegionBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         region_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4266,7 +4161,18 @@ public ShardHomeAllocated parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ShardHomeAllocated(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -4327,7 +4233,7 @@ public interface ShardHomeOrBuilder extends
   /**
    * Protobuf type {@code ShardHome}
    */
-  public  static final class ShardHome extends
+  public static final class ShardHome extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ShardHome)
       ShardHomeOrBuilder {
@@ -4348,61 +4254,6 @@ protected java.lang.Object newInstance(
       return new ShardHome();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ShardHome(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              shard_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              region_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHome_descriptor;
@@ -4418,11 +4269,13 @@ private ShardHome(
 
     private int bitField0_;
     public static final int SHARD_FIELD_NUMBER = 1;
-    private volatile java.lang.Object shard_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object shard_ = "";
     /**
      * required string shard = 1;
      * @return Whether the shard field is set.
      */
+    @java.lang.Override
     public boolean hasShard() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -4430,6 +4283,7 @@ public boolean hasShard() {
      * required string shard = 1;
      * @return The shard.
      */
+    @java.lang.Override
     public java.lang.String getShard() {
       java.lang.Object ref = shard_;
       if (ref instanceof java.lang.String) {
@@ -4448,6 +4302,7 @@ public java.lang.String getShard() {
      * required string shard = 1;
      * @return The bytes for shard.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getShardBytes() {
       java.lang.Object ref = shard_;
@@ -4463,11 +4318,13 @@ public java.lang.String getShard() {
     }
 
     public static final int REGION_FIELD_NUMBER = 2;
-    private volatile java.lang.Object region_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object region_ = "";
     /**
      * required string region = 2;
      * @return Whether the region field is set.
      */
+    @java.lang.Override
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -4475,6 +4332,7 @@ public boolean hasRegion() {
      * required string region = 2;
      * @return The region.
      */
+    @java.lang.Override
     public java.lang.String getRegion() {
       java.lang.Object ref = region_;
       if (ref instanceof java.lang.String) {
@@ -4493,6 +4351,7 @@ public java.lang.String getRegion() {
      * required string region = 2;
      * @return The bytes for region.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getRegionBytes() {
       java.lang.Object ref = region_;
@@ -4535,7 +4394,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, region_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -4550,7 +4409,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000002) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, region_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4575,7 +4434,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getRegion()
             .equals(other.getRegion())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -4594,7 +4453,7 @@ public int hashCode() {
         hash = (37 * hash) + REGION_FIELD_NUMBER;
         hash = (53 * hash) + getRegion().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4643,11 +4502,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -4711,26 +4572,20 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         shard_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         region_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -4757,19 +4612,23 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Sh
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.shard_ = shard_;
           to_bitField0_ |= 0x00000001;
         }
-        result.shard_ = shard_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.region_ = region_;
           to_bitField0_ |= 0x00000002;
         }
-        result.region_ = region_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -4817,16 +4676,16 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome other) {
         if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome.getDefaultInstance()) return this;
         if (other.hasShard()) {
-          bitField0_ |= 0x00000001;
           shard_ = other.shard_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasRegion()) {
-          bitField0_ |= 0x00000002;
           region_ = other.region_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -4847,17 +4706,40 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                shard_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                region_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -4912,11 +4794,9 @@ public java.lang.String getShard() {
        */
       public Builder setShard(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         shard_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4925,8 +4805,8 @@ public Builder setShard(
        * @return This builder for chaining.
        */
       public Builder clearShard() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         shard_ = getDefaultInstance().getShard();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -4937,11 +4817,9 @@ public Builder clearShard() {
        */
       public Builder setShardBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         shard_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4996,11 +4874,9 @@ public java.lang.String getRegion() {
        */
       public Builder setRegion(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         region_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -5009,8 +4885,8 @@ public Builder setRegion(
        * @return This builder for chaining.
        */
       public Builder clearRegion() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         region_ = getDefaultInstance().getRegion();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -5021,11 +4897,9 @@ public Builder clearRegion() {
        */
       public Builder setRegionBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         region_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -5062,7 +4936,18 @@ public ShardHome parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ShardHome(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -5135,7 +5020,7 @@ public interface ShardHomesEntryOrBuilder extends
    *
    * Protobuf type {@code ShardHomesEntry}
    */
-  public  static final class ShardHomesEntry extends
+  public static final class ShardHomesEntry extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ShardHomesEntry)
       ShardHomesEntryOrBuilder {
@@ -5146,7 +5031,8 @@ private ShardHomesEntry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.
     }
     private ShardHomesEntry() {
       region_ = "";
-      shard_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      shard_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -5156,67 +5042,6 @@ protected java.lang.Object newInstance(
       return new ShardHomesEntry();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ShardHomesEntry(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              region_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                shard_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              shard_.add(bs);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          shard_ = shard_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomesEntry_descriptor;
@@ -5232,11 +5057,13 @@ private ShardHomesEntry(
 
     private int bitField0_;
     public static final int REGION_FIELD_NUMBER = 1;
-    private volatile java.lang.Object region_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object region_ = "";
     /**
      * required string region = 1;
      * @return Whether the region field is set.
      */
+    @java.lang.Override
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -5244,6 +5071,7 @@ public boolean hasRegion() {
      * required string region = 1;
      * @return The region.
      */
+    @java.lang.Override
     public java.lang.String getRegion() {
       java.lang.Object ref = region_;
       if (ref instanceof java.lang.String) {
@@ -5262,6 +5090,7 @@ public java.lang.String getRegion() {
      * required string region = 1;
      * @return The bytes for region.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getRegionBytes() {
       java.lang.Object ref = region_;
@@ -5277,7 +5106,9 @@ public java.lang.String getRegion() {
     }
 
     public static final int SHARD_FIELD_NUMBER = 2;
-    private org.apache.pekko.protobufv3.internal.LazyStringList shard_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList shard_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string shard = 2;
      * @return A list containing the shard.
@@ -5335,7 +5166,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < shard_.size(); i++) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, shard_.getRaw(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -5355,7 +5186,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getShardList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5377,7 +5208,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getShardList()
           .equals(other.getShardList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -5396,7 +5227,7 @@ public int hashCode() {
         hash = (37 * hash) + SHARD_FIELD_NUMBER;
         hash = (53 * hash) + getShardList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -5445,11 +5276,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -5517,26 +5350,21 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         region_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
-        shard_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        shard_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         return this;
       }
 
@@ -5563,20 +5391,23 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Sh
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.region_ = region_;
           to_bitField0_ |= 0x00000001;
         }
-        result.region_ = region_;
-        if (((bitField0_ & 0x00000002) != 0)) {
-          shard_ = shard_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000002);
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          shard_.makeImmutable();
+          result.shard_ = shard_;
         }
-        result.shard_ = shard_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -5624,21 +5455,21 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry other) {
         if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.getDefaultInstance()) return this;
         if (other.hasRegion()) {
-          bitField0_ |= 0x00000001;
           region_ = other.region_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.shard_.isEmpty()) {
           if (shard_.isEmpty()) {
             shard_ = other.shard_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ |= 0x00000002;
           } else {
             ensureShardIsMutable();
             shard_.addAll(other.shard_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -5656,17 +5487,41 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                region_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureShardIsMutable();
+                shard_.add(bs);
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -5721,11 +5576,9 @@ public java.lang.String getRegion() {
        */
       public Builder setRegion(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         region_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -5734,8 +5587,8 @@ public Builder setRegion(
        * @return This builder for chaining.
        */
       public Builder clearRegion() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         region_ = getDefaultInstance().getRegion();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -5746,21 +5599,20 @@ public Builder clearRegion() {
        */
       public Builder setRegionBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         region_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList shard_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList shard_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureShardIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!shard_.isModifiable()) {
           shard_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(shard_);
-          bitField0_ |= 0x00000002;
-         }
+        }
+        bitField0_ |= 0x00000002;
       }
       /**
        * repeated string shard = 2;
@@ -5768,7 +5620,8 @@ private void ensureShardIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getShardList() {
-        return shard_.getUnmodifiableView();
+        shard_.makeImmutable();
+        return shard_;
       }
       /**
        * repeated string shard = 2;
@@ -5802,11 +5655,10 @@ public java.lang.String getShard(int index) {
        */
       public Builder setShard(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureShardIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureShardIsMutable();
         shard_.set(index, value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -5817,11 +5669,10 @@ public Builder setShard(
        */
       public Builder addShard(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureShardIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureShardIsMutable();
         shard_.add(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -5835,6 +5686,7 @@ public Builder addAllShard(
         ensureShardIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, shard_);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -5843,8 +5695,9 @@ public Builder addAllShard(
        * @return This builder for chaining.
        */
       public Builder clearShard() {
-        shard_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        shard_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);;
         onChanged();
         return this;
       }
@@ -5855,11 +5708,10 @@ public Builder clearShard() {
        */
       public Builder addShardBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureShardIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureShardIsMutable();
         shard_.add(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -5896,7 +5748,18 @@ public ShardHomesEntry parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ShardHomesEntry(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -5947,7 +5810,7 @@ org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome
   /**
    * Protobuf type {@code ShardHomes}
    */
-  public  static final class ShardHomes extends
+  public static final class ShardHomes extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ShardHomes)
       ShardHomesOrBuilder {
@@ -5967,61 +5830,6 @@ protected java.lang.Object newInstance(
       return new ShardHomes();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ShardHomes(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                homes_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              homes_.add(
-                  input.readMessage(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          homes_ = java.util.Collections.unmodifiableList(homes_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomes_descriptor;
@@ -6036,16 +5844,19 @@ private ShardHomes(
     }
 
     public static final int HOMES_FIELD_NUMBER = 1;
+    @SuppressWarnings("serial")
     private java.util.List homes_;
     /**
      * repeated .ShardHomesEntry homes = 1;
      */
+    @java.lang.Override
     public java.util.List getHomesList() {
       return homes_;
     }
     /**
      * repeated .ShardHomesEntry homes = 1;
      */
+    @java.lang.Override
     public java.util.List 
         getHomesOrBuilderList() {
       return homes_;
@@ -6053,18 +5864,21 @@ public java.util.Listrepeated .ShardHomesEntry homes = 1;
      */
+    @java.lang.Override
     public int getHomesCount() {
       return homes_.size();
     }
     /**
      * repeated .ShardHomesEntry homes = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry getHomes(int index) {
       return homes_.get(index);
     }
     /**
      * repeated .ShardHomesEntry homes = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntryOrBuilder getHomesOrBuilder(
         int index) {
       return homes_.get(index);
@@ -6093,7 +5907,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < homes_.size(); i++) {
         output.writeMessage(1, homes_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -6106,7 +5920,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, homes_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -6123,7 +5937,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getHomesList()
           .equals(other.getHomesList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -6138,7 +5952,7 @@ public int hashCode() {
         hash = (37 * hash) + HOMES_FIELD_NUMBER;
         hash = (53 * hash) + getHomesList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -6187,11 +6001,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -6255,29 +6071,25 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getHomesFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (homesBuilder_ == null) {
           homes_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
+          homes_ = null;
           homesBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -6304,7 +6116,13 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Sh
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes(this);
-        int from_bitField0_ = bitField0_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes result) {
         if (homesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             homes_ = java.util.Collections.unmodifiableList(homes_);
@@ -6314,8 +6132,10 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Sh
         } else {
           result.homes_ = homesBuilder_.build();
         }
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes result) {
+        int from_bitField0_ = bitField0_;
       }
 
       @java.lang.Override
@@ -6388,7 +6208,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterS
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -6408,17 +6228,43 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.PARSER,
+                        extensionRegistry);
+                if (homesBuilder_ == null) {
+                  ensureHomesIsMutable();
+                  homes_.add(m);
+                } else {
+                  homesBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -6695,7 +6541,18 @@ public ShardHomes parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ShardHomes(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -6747,7 +6604,7 @@ public interface EntityStateOrBuilder extends
   /**
    * Protobuf type {@code EntityState}
    */
-  public  static final class EntityState extends
+  public static final class EntityState extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:EntityState)
       EntityStateOrBuilder {
@@ -6757,7 +6614,8 @@ private EntityState(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Buil
       super(builder);
     }
     private EntityState() {
-      entities_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      entities_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -6767,61 +6625,6 @@ protected java.lang.Object newInstance(
       return new EntityState();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private EntityState(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                entities_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              entities_.add(bs);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          entities_ = entities_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityState_descriptor;
@@ -6836,7 +6639,9 @@ private EntityState(
     }
 
     public static final int ENTITIES_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.LazyStringList entities_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList entities_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string entities = 1;
      * @return A list containing the entities.
@@ -6887,7 +6692,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < entities_.size(); i++) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entities_.getRaw(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -6904,7 +6709,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getEntitiesList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -6921,7 +6726,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getEntitiesList()
           .equals(other.getEntitiesList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -6936,7 +6741,7 @@ public int hashCode() {
         hash = (37 * hash) + ENTITIES_FIELD_NUMBER;
         hash = (53 * hash) + getEntitiesList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -6985,11 +6790,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -7053,24 +6860,20 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        entities_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = 0;
+        entities_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         return this;
       }
 
@@ -7097,16 +6900,19 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.En
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState(this);
-        int from_bitField0_ = bitField0_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          entities_ = entities_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.entities_ = entities_;
+        if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          entities_.makeImmutable();
+          result.entities_ = entities_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -7154,14 +6960,14 @@ public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterS
         if (!other.entities_.isEmpty()) {
           if (entities_.isEmpty()) {
             entities_ = other.entities_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ |= 0x00000001;
           } else {
             ensureEntitiesIsMutable();
             entities_.addAll(other.entities_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -7176,27 +6982,47 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureEntitiesIsMutable();
+                entities_.add(bs);
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList entities_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList entities_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureEntitiesIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!entities_.isModifiable()) {
           entities_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(entities_);
-          bitField0_ |= 0x00000001;
-         }
+        }
+        bitField0_ |= 0x00000001;
       }
       /**
        * repeated string entities = 1;
@@ -7204,7 +7030,8 @@ private void ensureEntitiesIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getEntitiesList() {
-        return entities_.getUnmodifiableView();
+        entities_.makeImmutable();
+        return entities_;
       }
       /**
        * repeated string entities = 1;
@@ -7238,11 +7065,10 @@ public java.lang.String getEntities(int index) {
        */
       public Builder setEntities(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureEntitiesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureEntitiesIsMutable();
         entities_.set(index, value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -7253,11 +7079,10 @@ public Builder setEntities(
        */
       public Builder addEntities(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureEntitiesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureEntitiesIsMutable();
         entities_.add(value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -7271,6 +7096,7 @@ public Builder addAllEntities(
         ensureEntitiesIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, entities_);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -7279,8 +7105,9 @@ public Builder addAllEntities(
        * @return This builder for chaining.
        */
       public Builder clearEntities() {
-        entities_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        entities_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);;
         onChanged();
         return this;
       }
@@ -7291,11 +7118,10 @@ public Builder clearEntities() {
        */
       public Builder addEntitiesBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureEntitiesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureEntitiesIsMutable();
         entities_.add(value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -7332,7 +7158,18 @@ public EntityState parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new EntityState(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -7380,7 +7217,7 @@ public interface EntityStartedOrBuilder extends
    *
    * Protobuf type {@code EntityStarted}
    */
-  public  static final class EntityStarted extends
+  public static final class EntityStarted extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:EntityStarted)
       EntityStartedOrBuilder {
@@ -7400,55 +7237,6 @@ protected java.lang.Object newInstance(
       return new EntityStarted();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private EntityStarted(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              entityId_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStarted_descriptor;
@@ -7464,11 +7252,13 @@ private EntityStarted(
 
     private int bitField0_;
     public static final int ENTITYID_FIELD_NUMBER = 1;
-    private volatile java.lang.Object entityId_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object entityId_ = "";
     /**
      * required string entityId = 1;
      * @return Whether the entityId field is set.
      */
+    @java.lang.Override
     public boolean hasEntityId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -7476,6 +7266,7 @@ public boolean hasEntityId() {
      * required string entityId = 1;
      * @return The entityId.
      */
+    @java.lang.Override
     public java.lang.String getEntityId() {
       java.lang.Object ref = entityId_;
       if (ref instanceof java.lang.String) {
@@ -7494,6 +7285,7 @@ public java.lang.String getEntityId() {
      * required string entityId = 1;
      * @return The bytes for entityId.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdBytes() {
       java.lang.Object ref = entityId_;
@@ -7529,7 +7321,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entityId_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -7541,7 +7333,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000001) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, entityId_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -7561,7 +7353,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getEntityId()
             .equals(other.getEntityId())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -7576,7 +7368,7 @@ public int hashCode() {
         hash = (37 * hash) + ENTITYID_FIELD_NUMBER;
         hash = (53 * hash) + getEntityId().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -7625,11 +7417,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -7697,24 +7491,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         entityId_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -7741,15 +7530,19 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.En
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted(this);
-        int from_bitField0_ = bitField0_;
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted result) {
+        int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.entityId_ = entityId_;
           to_bitField0_ |= 0x00000001;
         }
-        result.entityId_ = entityId_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -7797,11 +7590,11 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted other) {
         if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted.getDefaultInstance()) return this;
         if (other.hasEntityId()) {
-          bitField0_ |= 0x00000001;
           entityId_ = other.entityId_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -7819,17 +7612,35 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                entityId_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -7884,11 +7695,9 @@ public java.lang.String getEntityId() {
        */
       public Builder setEntityId(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         entityId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -7897,8 +7706,8 @@ public Builder setEntityId(
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         entityId_ = getDefaultInstance().getEntityId();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -7909,11 +7718,9 @@ public Builder clearEntityId() {
        */
       public Builder setEntityIdBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         entityId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -7950,7 +7757,18 @@ public EntityStarted parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new EntityStarted(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -8002,7 +7820,7 @@ public interface EntitiesStartedOrBuilder extends
   /**
    * Protobuf type {@code EntitiesStarted}
    */
-  public  static final class EntitiesStarted extends
+  public static final class EntitiesStarted extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:EntitiesStarted)
       EntitiesStartedOrBuilder {
@@ -8012,7 +7830,8 @@ private EntitiesStarted(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.
       super(builder);
     }
     private EntitiesStarted() {
-      entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      entityId_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -8022,61 +7841,6 @@ protected java.lang.Object newInstance(
       return new EntitiesStarted();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private EntitiesStarted(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                entityId_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              entityId_.add(bs);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          entityId_ = entityId_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStarted_descriptor;
@@ -8091,7 +7855,9 @@ private EntitiesStarted(
     }
 
     public static final int ENTITYID_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.LazyStringList entityId_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList entityId_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string entityId = 1;
      * @return A list containing the entityId.
@@ -8142,7 +7908,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < entityId_.size(); i++) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entityId_.getRaw(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -8159,7 +7925,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getEntityIdList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -8176,7 +7942,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getEntityIdList()
           .equals(other.getEntityIdList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -8191,7 +7957,7 @@ public int hashCode() {
         hash = (37 * hash) + ENTITYID_FIELD_NUMBER;
         hash = (53 * hash) + getEntityIdList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -8240,11 +8006,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -8308,24 +8076,20 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = 0;
+        entityId_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         return this;
       }
 
@@ -8352,16 +8116,19 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.En
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted(this);
-        int from_bitField0_ = bitField0_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          entityId_ = entityId_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.entityId_ = entityId_;
+        if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          entityId_.makeImmutable();
+          result.entityId_ = entityId_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -8409,14 +8176,14 @@ public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterS
         if (!other.entityId_.isEmpty()) {
           if (entityId_.isEmpty()) {
             entityId_ = other.entityId_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ |= 0x00000001;
           } else {
             ensureEntityIdIsMutable();
             entityId_.addAll(other.entityId_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -8431,27 +8198,47 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureEntityIdIsMutable();
+                entityId_.add(bs);
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList entityId_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureEntityIdIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!entityId_.isModifiable()) {
           entityId_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(entityId_);
-          bitField0_ |= 0x00000001;
-         }
+        }
+        bitField0_ |= 0x00000001;
       }
       /**
        * repeated string entityId = 1;
@@ -8459,7 +8246,8 @@ private void ensureEntityIdIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getEntityIdList() {
-        return entityId_.getUnmodifiableView();
+        entityId_.makeImmutable();
+        return entityId_;
       }
       /**
        * repeated string entityId = 1;
@@ -8493,11 +8281,10 @@ public java.lang.String getEntityId(int index) {
        */
       public Builder setEntityId(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureEntityIdIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureEntityIdIsMutable();
         entityId_.set(index, value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8508,11 +8295,10 @@ public Builder setEntityId(
        */
       public Builder addEntityId(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureEntityIdIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureEntityIdIsMutable();
         entityId_.add(value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8526,6 +8312,7 @@ public Builder addAllEntityId(
         ensureEntityIdIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, entityId_);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8534,8 +8321,9 @@ public Builder addAllEntityId(
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
-        entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        entityId_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);;
         onChanged();
         return this;
       }
@@ -8546,11 +8334,10 @@ public Builder clearEntityId() {
        */
       public Builder addEntityIdBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureEntityIdIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureEntityIdIsMutable();
         entityId_.add(value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8587,7 +8374,18 @@ public EntitiesStarted parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new EntitiesStarted(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -8635,7 +8433,7 @@ public interface EntityStoppedOrBuilder extends
    *
    * Protobuf type {@code EntityStopped}
    */
-  public  static final class EntityStopped extends
+  public static final class EntityStopped extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:EntityStopped)
       EntityStoppedOrBuilder {
@@ -8655,55 +8453,6 @@ protected java.lang.Object newInstance(
       return new EntityStopped();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private EntityStopped(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              entityId_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStopped_descriptor;
@@ -8719,11 +8468,13 @@ private EntityStopped(
 
     private int bitField0_;
     public static final int ENTITYID_FIELD_NUMBER = 1;
-    private volatile java.lang.Object entityId_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object entityId_ = "";
     /**
      * required string entityId = 1;
      * @return Whether the entityId field is set.
      */
+    @java.lang.Override
     public boolean hasEntityId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -8731,6 +8482,7 @@ public boolean hasEntityId() {
      * required string entityId = 1;
      * @return The entityId.
      */
+    @java.lang.Override
     public java.lang.String getEntityId() {
       java.lang.Object ref = entityId_;
       if (ref instanceof java.lang.String) {
@@ -8749,6 +8501,7 @@ public java.lang.String getEntityId() {
      * required string entityId = 1;
      * @return The bytes for entityId.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdBytes() {
       java.lang.Object ref = entityId_;
@@ -8784,7 +8537,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entityId_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -8796,7 +8549,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000001) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, entityId_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -8816,7 +8569,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getEntityId()
             .equals(other.getEntityId())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -8831,7 +8584,7 @@ public int hashCode() {
         hash = (37 * hash) + ENTITYID_FIELD_NUMBER;
         hash = (53 * hash) + getEntityId().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -8880,11 +8633,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -8952,24 +8707,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         entityId_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -8996,15 +8746,19 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.En
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.entityId_ = entityId_;
           to_bitField0_ |= 0x00000001;
         }
-        result.entityId_ = entityId_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -9052,11 +8806,11 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped other) {
         if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped.getDefaultInstance()) return this;
         if (other.hasEntityId()) {
-          bitField0_ |= 0x00000001;
           entityId_ = other.entityId_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -9074,17 +8828,35 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                entityId_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -9139,11 +8911,9 @@ public java.lang.String getEntityId() {
        */
       public Builder setEntityId(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         entityId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -9152,8 +8922,8 @@ public Builder setEntityId(
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         entityId_ = getDefaultInstance().getEntityId();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -9164,11 +8934,9 @@ public Builder clearEntityId() {
        */
       public Builder setEntityIdBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         entityId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -9205,7 +8973,18 @@ public EntityStopped parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new EntityStopped(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -9257,7 +9036,7 @@ public interface EntitiesStoppedOrBuilder extends
   /**
    * Protobuf type {@code EntitiesStopped}
    */
-  public  static final class EntitiesStopped extends
+  public static final class EntitiesStopped extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:EntitiesStopped)
       EntitiesStoppedOrBuilder {
@@ -9267,7 +9046,8 @@ private EntitiesStopped(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.
       super(builder);
     }
     private EntitiesStopped() {
-      entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      entityId_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -9277,61 +9057,6 @@ protected java.lang.Object newInstance(
       return new EntitiesStopped();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private EntitiesStopped(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                entityId_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              entityId_.add(bs);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          entityId_ = entityId_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStopped_descriptor;
@@ -9346,7 +9071,9 @@ private EntitiesStopped(
     }
 
     public static final int ENTITYID_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.LazyStringList entityId_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList entityId_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string entityId = 1;
      * @return A list containing the entityId.
@@ -9397,7 +9124,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < entityId_.size(); i++) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entityId_.getRaw(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -9414,7 +9141,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getEntityIdList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -9431,7 +9158,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getEntityIdList()
           .equals(other.getEntityIdList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -9446,7 +9173,7 @@ public int hashCode() {
         hash = (37 * hash) + ENTITYID_FIELD_NUMBER;
         hash = (53 * hash) + getEntityIdList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -9495,11 +9222,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -9563,24 +9292,20 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = 0;
+        entityId_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         return this;
       }
 
@@ -9607,16 +9332,19 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.En
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped(this);
-        int from_bitField0_ = bitField0_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          entityId_ = entityId_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.entityId_ = entityId_;
+        if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          entityId_.makeImmutable();
+          result.entityId_ = entityId_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -9664,14 +9392,14 @@ public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterS
         if (!other.entityId_.isEmpty()) {
           if (entityId_.isEmpty()) {
             entityId_ = other.entityId_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ |= 0x00000001;
           } else {
             ensureEntityIdIsMutable();
             entityId_.addAll(other.entityId_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -9686,27 +9414,47 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureEntityIdIsMutable();
+                entityId_.add(bs);
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList entityId_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureEntityIdIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!entityId_.isModifiable()) {
           entityId_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(entityId_);
-          bitField0_ |= 0x00000001;
-         }
+        }
+        bitField0_ |= 0x00000001;
       }
       /**
        * repeated string entityId = 1;
@@ -9714,7 +9462,8 @@ private void ensureEntityIdIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getEntityIdList() {
-        return entityId_.getUnmodifiableView();
+        entityId_.makeImmutable();
+        return entityId_;
       }
       /**
        * repeated string entityId = 1;
@@ -9748,11 +9497,10 @@ public java.lang.String getEntityId(int index) {
        */
       public Builder setEntityId(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureEntityIdIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureEntityIdIsMutable();
         entityId_.set(index, value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -9763,11 +9511,10 @@ public Builder setEntityId(
        */
       public Builder addEntityId(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureEntityIdIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureEntityIdIsMutable();
         entityId_.add(value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -9781,6 +9528,7 @@ public Builder addAllEntityId(
         ensureEntityIdIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, entityId_);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -9789,8 +9537,9 @@ public Builder addAllEntityId(
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
-        entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        entityId_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);;
         onChanged();
         return this;
       }
@@ -9801,11 +9550,10 @@ public Builder clearEntityId() {
        */
       public Builder addEntityIdBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureEntityIdIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureEntityIdIsMutable();
         entityId_.add(value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -9842,7 +9590,18 @@ public EntitiesStopped parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new EntitiesStopped(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -9897,7 +9656,7 @@ public interface ShardStatsOrBuilder extends
   /**
    * Protobuf type {@code ShardStats}
    */
-  public  static final class ShardStats extends
+  public static final class ShardStats extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ShardStats)
       ShardStatsOrBuilder {
@@ -9917,60 +9676,6 @@ protected java.lang.Object newInstance(
       return new ShardStats();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ShardStats(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              shard_ = bs;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              entityCount_ = input.readInt32();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardStats_descriptor;
@@ -9986,11 +9691,13 @@ private ShardStats(
 
     private int bitField0_;
     public static final int SHARD_FIELD_NUMBER = 1;
-    private volatile java.lang.Object shard_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object shard_ = "";
     /**
      * required string shard = 1;
      * @return Whether the shard field is set.
      */
+    @java.lang.Override
     public boolean hasShard() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -9998,6 +9705,7 @@ public boolean hasShard() {
      * required string shard = 1;
      * @return The shard.
      */
+    @java.lang.Override
     public java.lang.String getShard() {
       java.lang.Object ref = shard_;
       if (ref instanceof java.lang.String) {
@@ -10016,6 +9724,7 @@ public java.lang.String getShard() {
      * required string shard = 1;
      * @return The bytes for shard.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getShardBytes() {
       java.lang.Object ref = shard_;
@@ -10031,11 +9740,12 @@ public java.lang.String getShard() {
     }
 
     public static final int ENTITYCOUNT_FIELD_NUMBER = 2;
-    private int entityCount_;
+    private int entityCount_ = 0;
     /**
      * required int32 entityCount = 2;
      * @return Whether the entityCount field is set.
      */
+    @java.lang.Override
     public boolean hasEntityCount() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -10043,6 +9753,7 @@ public boolean hasEntityCount() {
      * required int32 entityCount = 2;
      * @return The entityCount.
      */
+    @java.lang.Override
     public int getEntityCount() {
       return entityCount_;
     }
@@ -10075,7 +9786,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeInt32(2, entityCount_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -10091,7 +9802,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(2, entityCount_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -10116,7 +9827,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getEntityCount()
             != other.getEntityCount()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -10135,7 +9846,7 @@ public int hashCode() {
         hash = (37 * hash) + ENTITYCOUNT_FIELD_NUMBER;
         hash = (53 * hash) + getEntityCount();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -10184,11 +9895,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -10252,26 +9965,20 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         shard_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         entityCount_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -10298,19 +10005,23 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Sh
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.shard_ = shard_;
           to_bitField0_ |= 0x00000001;
         }
-        result.shard_ = shard_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.entityCount_ = entityCount_;
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -10358,14 +10069,14 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats other) {
         if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats.getDefaultInstance()) return this;
         if (other.hasShard()) {
-          bitField0_ |= 0x00000001;
           shard_ = other.shard_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasEntityCount()) {
           setEntityCount(other.getEntityCount());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -10386,17 +10097,40 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                shard_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                entityCount_ = input.readInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -10451,11 +10185,9 @@ public java.lang.String getShard() {
        */
       public Builder setShard(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         shard_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -10464,8 +10196,8 @@ public Builder setShard(
        * @return This builder for chaining.
        */
       public Builder clearShard() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         shard_ = getDefaultInstance().getShard();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -10476,11 +10208,9 @@ public Builder clearShard() {
        */
       public Builder setShardBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         shard_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -10490,6 +10220,7 @@ public Builder setShardBytes(
        * required int32 entityCount = 2;
        * @return Whether the entityCount field is set.
        */
+      @java.lang.Override
       public boolean hasEntityCount() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -10497,6 +10228,7 @@ public boolean hasEntityCount() {
        * required int32 entityCount = 2;
        * @return The entityCount.
        */
+      @java.lang.Override
       public int getEntityCount() {
         return entityCount_;
       }
@@ -10506,8 +10238,9 @@ public int getEntityCount() {
        * @return This builder for chaining.
        */
       public Builder setEntityCount(int value) {
-        bitField0_ |= 0x00000002;
+
         entityCount_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -10554,7 +10287,18 @@ public ShardStats parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ShardStats(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -10630,7 +10374,7 @@ org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldE
   /**
    * Protobuf type {@code ShardRegionStats}
    */
-  public  static final class ShardRegionStats extends
+  public static final class ShardRegionStats extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ShardRegionStats)
       ShardRegionStatsOrBuilder {
@@ -10641,7 +10385,8 @@ private ShardRegionStats(org.apache.pekko.protobufv3.internal.GeneratedMessageV3
     }
     private ShardRegionStats() {
       stats_ = java.util.Collections.emptyList();
-      failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      failed_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -10651,73 +10396,6 @@ protected java.lang.Object newInstance(
       return new ShardRegionStats();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ShardRegionStats(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                stats_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              stats_.add(
-                  input.readMessage(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.PARSER, extensionRegistry));
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                failed_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              failed_.add(bs);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          stats_ = java.util.Collections.unmodifiableList(stats_);
-        }
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          failed_ = failed_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardRegionStats_descriptor;
@@ -10732,16 +10410,19 @@ private ShardRegionStats(
     }
 
     public static final int STATS_FIELD_NUMBER = 1;
+    @SuppressWarnings("serial")
     private java.util.List stats_;
     /**
      * repeated .MapFieldEntry stats = 1;
      */
+    @java.lang.Override
     public java.util.List getStatsList() {
       return stats_;
     }
     /**
      * repeated .MapFieldEntry stats = 1;
      */
+    @java.lang.Override
     public java.util.List 
         getStatsOrBuilderList() {
       return stats_;
@@ -10749,25 +10430,30 @@ public java.util.Listrepeated .MapFieldEntry stats = 1;
      */
+    @java.lang.Override
     public int getStatsCount() {
       return stats_.size();
     }
     /**
      * repeated .MapFieldEntry stats = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry getStats(int index) {
       return stats_.get(index);
     }
     /**
      * repeated .MapFieldEntry stats = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntryOrBuilder getStatsOrBuilder(
         int index) {
       return stats_.get(index);
     }
 
     public static final int FAILED_FIELD_NUMBER = 2;
-    private org.apache.pekko.protobufv3.internal.LazyStringList failed_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList failed_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string failed = 2;
      * @return A list containing the failed.
@@ -10821,7 +10507,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < failed_.size(); i++) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, failed_.getRaw(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -10842,7 +10528,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getFailedList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -10861,7 +10547,7 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getStatsList())) return false;
       if (!getFailedList()
           .equals(other.getFailedList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -10880,7 +10566,7 @@ public int hashCode() {
         hash = (37 * hash) + FAILED_FIELD_NUMBER;
         hash = (53 * hash) + getFailedList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -10929,11 +10615,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -10997,31 +10685,27 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getStatsFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (statsBuilder_ == null) {
           stats_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
+          stats_ = null;
           statsBuilder_.clear();
         }
-        failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
+        failed_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         return this;
       }
 
@@ -11048,7 +10732,13 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Sh
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats(this);
-        int from_bitField0_ = bitField0_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats result) {
         if (statsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             stats_ = java.util.Collections.unmodifiableList(stats_);
@@ -11058,13 +10748,14 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Sh
         } else {
           result.stats_ = statsBuilder_.build();
         }
-        if (((bitField0_ & 0x00000002) != 0)) {
-          failed_ = failed_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000002);
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          failed_.makeImmutable();
+          result.failed_ = failed_;
         }
-        result.failed_ = failed_;
-        onBuilt();
-        return result;
       }
 
       @java.lang.Override
@@ -11140,14 +10831,14 @@ public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterS
         if (!other.failed_.isEmpty()) {
           if (failed_.isEmpty()) {
             failed_ = other.failed_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ |= 0x00000002;
           } else {
             ensureFailedIsMutable();
             failed_.addAll(other.failed_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -11162,17 +10853,49 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.PARSER,
+                        extensionRegistry);
+                if (statsBuilder_ == null) {
+                  ensureStatsIsMutable();
+                  stats_.add(m);
+                } else {
+                  statsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+              case 18: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureFailedIsMutable();
+                failed_.add(bs);
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -11417,12 +11140,13 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Ma
         return statsBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList failed_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureFailedIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!failed_.isModifiable()) {
           failed_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(failed_);
-          bitField0_ |= 0x00000002;
-         }
+        }
+        bitField0_ |= 0x00000002;
       }
       /**
        * repeated string failed = 2;
@@ -11430,7 +11154,8 @@ private void ensureFailedIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getFailedList() {
-        return failed_.getUnmodifiableView();
+        failed_.makeImmutable();
+        return failed_;
       }
       /**
        * repeated string failed = 2;
@@ -11464,11 +11189,10 @@ public java.lang.String getFailed(int index) {
        */
       public Builder setFailed(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureFailedIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureFailedIsMutable();
         failed_.set(index, value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -11479,11 +11203,10 @@ public Builder setFailed(
        */
       public Builder addFailed(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureFailedIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureFailedIsMutable();
         failed_.add(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -11497,6 +11220,7 @@ public Builder addAllFailed(
         ensureFailedIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, failed_);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -11505,8 +11229,9 @@ public Builder addAllFailed(
        * @return This builder for chaining.
        */
       public Builder clearFailed() {
-        failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        failed_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);;
         onChanged();
         return this;
       }
@@ -11517,11 +11242,10 @@ public Builder clearFailed() {
        */
       public Builder addFailedBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureFailedIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureFailedIsMutable();
         failed_.add(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -11558,7 +11282,18 @@ public ShardRegionStats parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ShardRegionStats(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -11613,7 +11348,7 @@ public interface MapFieldEntryOrBuilder extends
   /**
    * Protobuf type {@code MapFieldEntry}
    */
-  public  static final class MapFieldEntry extends
+  public static final class MapFieldEntry extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:MapFieldEntry)
       MapFieldEntryOrBuilder {
@@ -11633,60 +11368,6 @@ protected java.lang.Object newInstance(
       return new MapFieldEntry();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private MapFieldEntry(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              key_ = bs;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              value_ = input.readInt32();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_MapFieldEntry_descriptor;
@@ -11702,11 +11383,13 @@ private MapFieldEntry(
 
     private int bitField0_;
     public static final int KEY_FIELD_NUMBER = 1;
-    private volatile java.lang.Object key_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object key_ = "";
     /**
      * optional string key = 1;
      * @return Whether the key field is set.
      */
+    @java.lang.Override
     public boolean hasKey() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -11714,6 +11397,7 @@ public boolean hasKey() {
      * optional string key = 1;
      * @return The key.
      */
+    @java.lang.Override
     public java.lang.String getKey() {
       java.lang.Object ref = key_;
       if (ref instanceof java.lang.String) {
@@ -11732,6 +11416,7 @@ public java.lang.String getKey() {
      * optional string key = 1;
      * @return The bytes for key.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getKeyBytes() {
       java.lang.Object ref = key_;
@@ -11747,11 +11432,12 @@ public java.lang.String getKey() {
     }
 
     public static final int VALUE_FIELD_NUMBER = 2;
-    private int value_;
+    private int value_ = 0;
     /**
      * optional int32 value = 2;
      * @return Whether the value field is set.
      */
+    @java.lang.Override
     public boolean hasValue() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -11759,6 +11445,7 @@ public boolean hasValue() {
      * optional int32 value = 2;
      * @return The value.
      */
+    @java.lang.Override
     public int getValue() {
       return value_;
     }
@@ -11783,7 +11470,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeInt32(2, value_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -11799,7 +11486,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(2, value_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -11824,7 +11511,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getValue()
             != other.getValue()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -11843,7 +11530,7 @@ public int hashCode() {
         hash = (37 * hash) + VALUE_FIELD_NUMBER;
         hash = (53 * hash) + getValue();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -11892,11 +11579,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -11960,26 +11649,20 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         key_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         value_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -12006,19 +11689,23 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Ma
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.key_ = key_;
           to_bitField0_ |= 0x00000001;
         }
-        result.key_ = key_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.value_ = value_;
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -12066,14 +11753,14 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry other) {
         if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.getDefaultInstance()) return this;
         if (other.hasKey()) {
-          bitField0_ |= 0x00000001;
           key_ = other.key_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasValue()) {
           setValue(other.getValue());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -12088,17 +11775,40 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                key_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                value_ = input.readInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -12153,11 +11863,9 @@ public java.lang.String getKey() {
        */
       public Builder setKey(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         key_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -12166,8 +11874,8 @@ public Builder setKey(
        * @return This builder for chaining.
        */
       public Builder clearKey() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         key_ = getDefaultInstance().getKey();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -12178,11 +11886,9 @@ public Builder clearKey() {
        */
       public Builder setKeyBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         key_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -12192,6 +11898,7 @@ public Builder setKeyBytes(
        * optional int32 value = 2;
        * @return Whether the value field is set.
        */
+      @java.lang.Override
       public boolean hasValue() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -12199,6 +11906,7 @@ public boolean hasValue() {
        * optional int32 value = 2;
        * @return The value.
        */
+      @java.lang.Override
       public int getValue() {
         return value_;
       }
@@ -12208,8 +11916,9 @@ public int getValue() {
        * @return This builder for chaining.
        */
       public Builder setValue(int value) {
-        bitField0_ |= 0x00000002;
+
         value_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -12256,7 +11965,18 @@ public MapFieldEntry parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new MapFieldEntry(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -12294,7 +12014,7 @@ public interface GetClusterShardingStatsOrBuilder extends
   /**
    * Protobuf type {@code GetClusterShardingStats}
    */
-  public  static final class GetClusterShardingStats extends
+  public static final class GetClusterShardingStats extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:GetClusterShardingStats)
       GetClusterShardingStatsOrBuilder {
@@ -12313,54 +12033,6 @@ protected java.lang.Object newInstance(
       return new GetClusterShardingStats();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private GetClusterShardingStats(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              timeoutNanos_ = input.readInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_GetClusterShardingStats_descriptor;
@@ -12376,11 +12048,12 @@ private GetClusterShardingStats(
 
     private int bitField0_;
     public static final int TIMEOUTNANOS_FIELD_NUMBER = 1;
-    private long timeoutNanos_;
+    private long timeoutNanos_ = 0L;
     /**
      * required int64 timeoutNanos = 1;
      * @return Whether the timeoutNanos field is set.
      */
+    @java.lang.Override
     public boolean hasTimeoutNanos() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -12388,6 +12061,7 @@ public boolean hasTimeoutNanos() {
      * required int64 timeoutNanos = 1;
      * @return The timeoutNanos.
      */
+    @java.lang.Override
     public long getTimeoutNanos() {
       return timeoutNanos_;
     }
@@ -12413,7 +12087,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeInt64(1, timeoutNanos_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -12426,7 +12100,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(1, timeoutNanos_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -12446,7 +12120,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getTimeoutNanos()
             != other.getTimeoutNanos()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -12462,7 +12136,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getTimeoutNanos());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -12511,11 +12185,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -12579,24 +12255,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         timeoutNanos_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -12623,15 +12294,19 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Ge
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.timeoutNanos_ = timeoutNanos_;
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -12681,7 +12356,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterS
         if (other.hasTimeoutNanos()) {
           setTimeoutNanos(other.getTimeoutNanos());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -12699,17 +12374,35 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                timeoutNanos_ = input.readInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -12719,6 +12412,7 @@ public Builder mergeFrom(
        * required int64 timeoutNanos = 1;
        * @return Whether the timeoutNanos field is set.
        */
+      @java.lang.Override
       public boolean hasTimeoutNanos() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -12726,6 +12420,7 @@ public boolean hasTimeoutNanos() {
        * required int64 timeoutNanos = 1;
        * @return The timeoutNanos.
        */
+      @java.lang.Override
       public long getTimeoutNanos() {
         return timeoutNanos_;
       }
@@ -12735,8 +12430,9 @@ public long getTimeoutNanos() {
        * @return This builder for chaining.
        */
       public Builder setTimeoutNanos(long value) {
-        bitField0_ |= 0x00000001;
+
         timeoutNanos_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -12783,7 +12479,18 @@ public GetClusterShardingStats parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new GetClusterShardingStats(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -12834,7 +12541,7 @@ org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterSh
   /**
    * Protobuf type {@code ClusterShardingStats}
    */
-  public  static final class ClusterShardingStats extends
+  public static final class ClusterShardingStats extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ClusterShardingStats)
       ClusterShardingStatsOrBuilder {
@@ -12854,61 +12561,6 @@ protected java.lang.Object newInstance(
       return new ClusterShardingStats();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ClusterShardingStats(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                stats_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              stats_.add(
-                  input.readMessage(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          stats_ = java.util.Collections.unmodifiableList(stats_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStats_descriptor;
@@ -12923,16 +12575,19 @@ private ClusterShardingStats(
     }
 
     public static final int STATS_FIELD_NUMBER = 1;
+    @SuppressWarnings("serial")
     private java.util.List stats_;
     /**
      * repeated .ClusterShardingStatsEntry stats = 1;
      */
+    @java.lang.Override
     public java.util.List getStatsList() {
       return stats_;
     }
     /**
      * repeated .ClusterShardingStatsEntry stats = 1;
      */
+    @java.lang.Override
     public java.util.List 
         getStatsOrBuilderList() {
       return stats_;
@@ -12940,18 +12595,21 @@ public java.util.Listrepeated .ClusterShardingStatsEntry stats = 1;
      */
+    @java.lang.Override
     public int getStatsCount() {
       return stats_.size();
     }
     /**
      * repeated .ClusterShardingStatsEntry stats = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry getStats(int index) {
       return stats_.get(index);
     }
     /**
      * repeated .ClusterShardingStatsEntry stats = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntryOrBuilder getStatsOrBuilder(
         int index) {
       return stats_.get(index);
@@ -12980,7 +12638,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < stats_.size(); i++) {
         output.writeMessage(1, stats_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -12993,7 +12651,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, stats_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -13010,7 +12668,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getStatsList()
           .equals(other.getStatsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -13025,7 +12683,7 @@ public int hashCode() {
         hash = (37 * hash) + STATS_FIELD_NUMBER;
         hash = (53 * hash) + getStatsList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -13074,11 +12732,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -13142,29 +12802,25 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getStatsFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (statsBuilder_ == null) {
           stats_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
+          stats_ = null;
           statsBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -13191,7 +12847,13 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Cl
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats(this);
-        int from_bitField0_ = bitField0_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats result) {
         if (statsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             stats_ = java.util.Collections.unmodifiableList(stats_);
@@ -13201,8 +12863,10 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Cl
         } else {
           result.stats_ = statsBuilder_.build();
         }
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats result) {
+        int from_bitField0_ = bitField0_;
       }
 
       @java.lang.Override
@@ -13275,7 +12939,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterS
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -13295,17 +12959,43 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.PARSER,
+                        extensionRegistry);
+                if (statsBuilder_ == null) {
+                  ensureStatsIsMutable();
+                  stats_.add(m);
+                } else {
+                  statsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -13582,7 +13272,18 @@ public ClusterShardingStats parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ClusterShardingStats(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -13639,7 +13340,7 @@ public interface ClusterShardingStatsEntryOrBuilder extends
   /**
    * Protobuf type {@code ClusterShardingStatsEntry}
    */
-  public  static final class ClusterShardingStatsEntry extends
+  public static final class ClusterShardingStatsEntry extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ClusterShardingStatsEntry)
       ClusterShardingStatsEntryOrBuilder {
@@ -13652,81 +13353,12 @@ private ClusterShardingStatsEntry() {
     }
 
     @java.lang.Override
-    @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(
-        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
-      return new ClusterShardingStatsEntry();
-    }
-
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ClusterShardingStatsEntry(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = address_.toBuilder();
-              }
-              address_ = input.readMessage(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(address_);
-                address_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = stats_.toBuilder();
-              }
-              stats_ = input.readMessage(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(stats_);
-                stats_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+      return new ClusterShardingStatsEntry();
     }
+
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStatsEntry_descriptor;
@@ -13747,6 +13379,7 @@ private ClusterShardingStatsEntry(
      * required .Address address = 1;
      * @return Whether the address field is set.
      */
+    @java.lang.Override
     public boolean hasAddress() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -13754,12 +13387,14 @@ public boolean hasAddress() {
      * required .Address address = 1;
      * @return The address.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address getAddress() {
       return address_ == null ? org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance() : address_;
     }
     /**
      * required .Address address = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder getAddressOrBuilder() {
       return address_ == null ? org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance() : address_;
     }
@@ -13770,6 +13405,7 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Ad
      * required .ShardRegionStats stats = 2;
      * @return Whether the stats field is set.
      */
+    @java.lang.Override
     public boolean hasStats() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -13777,12 +13413,14 @@ public boolean hasStats() {
      * required .ShardRegionStats stats = 2;
      * @return The stats.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats getStats() {
       return stats_ == null ? org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.getDefaultInstance() : stats_;
     }
     /**
      * required .ShardRegionStats stats = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStatsOrBuilder getStatsOrBuilder() {
       return stats_ == null ? org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.getDefaultInstance() : stats_;
     }
@@ -13819,7 +13457,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getStats());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -13836,7 +13474,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getStats());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -13861,7 +13499,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getStats()
             .equals(other.getStats())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -13880,7 +13518,7 @@ public int hashCode() {
         hash = (37 * hash) + STATS_FIELD_NUMBER;
         hash = (53 * hash) + getStats().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -13929,11 +13567,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -14015,18 +13655,17 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (addressBuilder_ == null) {
-          address_ = null;
-        } else {
-          addressBuilder_.clear();
+        bitField0_ = 0;
+        address_ = null;
+        if (addressBuilder_ != null) {
+          addressBuilder_.dispose();
+          addressBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (statsBuilder_ == null) {
-          stats_ = null;
-        } else {
-          statsBuilder_.clear();
+        stats_ = null;
+        if (statsBuilder_ != null) {
+          statsBuilder_.dispose();
+          statsBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -14053,27 +13692,27 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Cl
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (addressBuilder_ == null) {
-            result.address_ = address_;
-          } else {
-            result.address_ = addressBuilder_.build();
-          }
+          result.address_ = addressBuilder_ == null
+              ? address_
+              : addressBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (statsBuilder_ == null) {
-            result.stats_ = stats_;
-          } else {
-            result.stats_ = statsBuilder_.build();
-          }
+          result.stats_ = statsBuilder_ == null
+              ? stats_
+              : statsBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -14126,7 +13765,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterS
         if (other.hasStats()) {
           mergeStats(other.getStats());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -14150,17 +13789,44 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getAddressFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getStatsFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -14195,11 +13861,11 @@ public Builder setAddress(org.apache.pekko.cluster.sharding.protobuf.msg.Cluster
             throw new NullPointerException();
           }
           address_ = value;
-          onChanged();
         } else {
           addressBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -14209,11 +13875,11 @@ public Builder setAddress(
           org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder builderForValue) {
         if (addressBuilder_ == null) {
           address_ = builderForValue.build();
-          onChanged();
         } else {
           addressBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -14222,31 +13888,32 @@ public Builder setAddress(
       public Builder mergeAddress(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address value) {
         if (addressBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              address_ != null &&
-              address_ != org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance()) {
-            address_ =
-              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.newBuilder(address_).mergeFrom(value).buildPartial();
+            address_ != null &&
+            address_ != org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance()) {
+            getAddressBuilder().mergeFrom(value);
           } else {
             address_ = value;
           }
-          onChanged();
         } else {
           addressBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (address_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Address address = 1;
        */
       public Builder clearAddress() {
-        if (addressBuilder_ == null) {
-          address_ = null;
-          onChanged();
-        } else {
-          addressBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        address_ = null;
+        if (addressBuilder_ != null) {
+          addressBuilder_.dispose();
+          addressBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -14315,11 +13982,11 @@ public Builder setStats(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterSh
             throw new NullPointerException();
           }
           stats_ = value;
-          onChanged();
         } else {
           statsBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -14329,11 +13996,11 @@ public Builder setStats(
           org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.Builder builderForValue) {
         if (statsBuilder_ == null) {
           stats_ = builderForValue.build();
-          onChanged();
         } else {
           statsBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -14342,31 +14009,32 @@ public Builder setStats(
       public Builder mergeStats(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats value) {
         if (statsBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              stats_ != null &&
-              stats_ != org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.getDefaultInstance()) {
-            stats_ =
-              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.newBuilder(stats_).mergeFrom(value).buildPartial();
+            stats_ != null &&
+            stats_ != org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.getDefaultInstance()) {
+            getStatsBuilder().mergeFrom(value);
           } else {
             stats_ = value;
           }
-          onChanged();
         } else {
           statsBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (stats_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .ShardRegionStats stats = 2;
        */
       public Builder clearStats() {
-        if (statsBuilder_ == null) {
-          stats_ = null;
-          onChanged();
-        } else {
-          statsBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        stats_ = null;
+        if (statsBuilder_ != null) {
+          statsBuilder_.dispose();
+          statsBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -14437,7 +14105,18 @@ public ClusterShardingStatsEntry parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ClusterShardingStatsEntry(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -14488,7 +14167,7 @@ org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOr
   /**
    * Protobuf type {@code CurrentRegions}
    */
-  public  static final class CurrentRegions extends
+  public static final class CurrentRegions extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:CurrentRegions)
       CurrentRegionsOrBuilder {
@@ -14508,61 +14187,6 @@ protected java.lang.Object newInstance(
       return new CurrentRegions();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private CurrentRegions(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                regions_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              regions_.add(
-                  input.readMessage(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          regions_ = java.util.Collections.unmodifiableList(regions_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentRegions_descriptor;
@@ -14577,16 +14201,19 @@ private CurrentRegions(
     }
 
     public static final int REGIONS_FIELD_NUMBER = 1;
+    @SuppressWarnings("serial")
     private java.util.List regions_;
     /**
      * repeated .Address regions = 1;
      */
+    @java.lang.Override
     public java.util.List getRegionsList() {
       return regions_;
     }
     /**
      * repeated .Address regions = 1;
      */
+    @java.lang.Override
     public java.util.List 
         getRegionsOrBuilderList() {
       return regions_;
@@ -14594,18 +14221,21 @@ public java.util.Listrepeated .Address regions = 1;
      */
+    @java.lang.Override
     public int getRegionsCount() {
       return regions_.size();
     }
     /**
      * repeated .Address regions = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address getRegions(int index) {
       return regions_.get(index);
     }
     /**
      * repeated .Address regions = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder getRegionsOrBuilder(
         int index) {
       return regions_.get(index);
@@ -14634,7 +14264,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < regions_.size(); i++) {
         output.writeMessage(1, regions_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -14647,7 +14277,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, regions_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -14664,7 +14294,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getRegionsList()
           .equals(other.getRegionsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -14679,7 +14309,7 @@ public int hashCode() {
         hash = (37 * hash) + REGIONS_FIELD_NUMBER;
         hash = (53 * hash) + getRegionsList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -14728,11 +14358,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -14796,29 +14428,25 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getRegionsFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (regionsBuilder_ == null) {
           regions_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
+          regions_ = null;
           regionsBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -14845,7 +14473,13 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Cu
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions(this);
-        int from_bitField0_ = bitField0_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions result) {
         if (regionsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             regions_ = java.util.Collections.unmodifiableList(regions_);
@@ -14855,8 +14489,10 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Cu
         } else {
           result.regions_ = regionsBuilder_.build();
         }
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions result) {
+        int from_bitField0_ = bitField0_;
       }
 
       @java.lang.Override
@@ -14929,7 +14565,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterS
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -14949,17 +14585,43 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.PARSER,
+                        extensionRegistry);
+                if (regionsBuilder_ == null) {
+                  ensureRegionsIsMutable();
+                  regions_.add(m);
+                } else {
+                  regionsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -15236,7 +14898,18 @@ public CurrentRegions parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new CurrentRegions(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -15330,7 +15003,7 @@ public interface AddressOrBuilder extends
    *
    * Protobuf type {@code Address}
    */
-  public  static final class Address extends
+  public static final class Address extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Address)
       AddressOrBuilder {
@@ -15352,72 +15025,6 @@ protected java.lang.Object newInstance(
       return new Address();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Address(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              protocol_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              system_ = bs;
-              break;
-            }
-            case 26: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000004;
-              hostname_ = bs;
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              port_ = input.readUInt32();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_Address_descriptor;
@@ -15433,11 +15040,13 @@ private Address(
 
     private int bitField0_;
     public static final int PROTOCOL_FIELD_NUMBER = 1;
-    private volatile java.lang.Object protocol_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object protocol_ = "";
     /**
      * required string protocol = 1;
      * @return Whether the protocol field is set.
      */
+    @java.lang.Override
     public boolean hasProtocol() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -15445,6 +15054,7 @@ public boolean hasProtocol() {
      * required string protocol = 1;
      * @return The protocol.
      */
+    @java.lang.Override
     public java.lang.String getProtocol() {
       java.lang.Object ref = protocol_;
       if (ref instanceof java.lang.String) {
@@ -15463,6 +15073,7 @@ public java.lang.String getProtocol() {
      * required string protocol = 1;
      * @return The bytes for protocol.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getProtocolBytes() {
       java.lang.Object ref = protocol_;
@@ -15478,11 +15089,13 @@ public java.lang.String getProtocol() {
     }
 
     public static final int SYSTEM_FIELD_NUMBER = 2;
-    private volatile java.lang.Object system_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object system_ = "";
     /**
      * required string system = 2;
      * @return Whether the system field is set.
      */
+    @java.lang.Override
     public boolean hasSystem() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -15490,6 +15103,7 @@ public boolean hasSystem() {
      * required string system = 2;
      * @return The system.
      */
+    @java.lang.Override
     public java.lang.String getSystem() {
       java.lang.Object ref = system_;
       if (ref instanceof java.lang.String) {
@@ -15508,6 +15122,7 @@ public java.lang.String getSystem() {
      * required string system = 2;
      * @return The bytes for system.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getSystemBytes() {
       java.lang.Object ref = system_;
@@ -15523,11 +15138,13 @@ public java.lang.String getSystem() {
     }
 
     public static final int HOSTNAME_FIELD_NUMBER = 3;
-    private volatile java.lang.Object hostname_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object hostname_ = "";
     /**
      * required string hostname = 3;
      * @return Whether the hostname field is set.
      */
+    @java.lang.Override
     public boolean hasHostname() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -15535,6 +15152,7 @@ public boolean hasHostname() {
      * required string hostname = 3;
      * @return The hostname.
      */
+    @java.lang.Override
     public java.lang.String getHostname() {
       java.lang.Object ref = hostname_;
       if (ref instanceof java.lang.String) {
@@ -15553,6 +15171,7 @@ public java.lang.String getHostname() {
      * required string hostname = 3;
      * @return The bytes for hostname.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getHostnameBytes() {
       java.lang.Object ref = hostname_;
@@ -15568,11 +15187,12 @@ public java.lang.String getHostname() {
     }
 
     public static final int PORT_FIELD_NUMBER = 4;
-    private int port_;
+    private int port_ = 0;
     /**
      * required uint32 port = 4;
      * @return Whether the port field is set.
      */
+    @java.lang.Override
     public boolean hasPort() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -15580,6 +15200,7 @@ public boolean hasPort() {
      * required uint32 port = 4;
      * @return The port.
      */
+    @java.lang.Override
     public int getPort() {
       return port_;
     }
@@ -15626,7 +15247,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeUInt32(4, port_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -15648,7 +15269,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(4, port_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -15683,7 +15304,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getPort()
             != other.getPort()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -15710,7 +15331,7 @@ public int hashCode() {
         hash = (37 * hash) + PORT_FIELD_NUMBER;
         hash = (53 * hash) + getPort();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -15759,11 +15380,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -15832,30 +15455,22 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         protocol_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         system_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         hostname_ = "";
-        bitField0_ = (bitField0_ & ~0x00000004);
         port_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -15882,27 +15497,31 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Ad
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.protocol_ = protocol_;
           to_bitField0_ |= 0x00000001;
         }
-        result.protocol_ = protocol_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.system_ = system_;
           to_bitField0_ |= 0x00000002;
         }
-        result.system_ = system_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.hostname_ = hostname_;
           to_bitField0_ |= 0x00000004;
         }
-        result.hostname_ = hostname_;
         if (((from_bitField0_ & 0x00000008) != 0)) {
           result.port_ = port_;
           to_bitField0_ |= 0x00000008;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -15950,24 +15569,24 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address other) {
         if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance()) return this;
         if (other.hasProtocol()) {
-          bitField0_ |= 0x00000001;
           protocol_ = other.protocol_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasSystem()) {
-          bitField0_ |= 0x00000002;
           system_ = other.system_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasHostname()) {
-          bitField0_ |= 0x00000004;
           hostname_ = other.hostname_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
         if (other.hasPort()) {
           setPort(other.getPort());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -15994,17 +15613,50 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                protocol_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                system_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 26: {
+                hostname_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              case 32: {
+                port_ = input.readUInt32();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -16059,11 +15711,9 @@ public java.lang.String getProtocol() {
        */
       public Builder setProtocol(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         protocol_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -16072,8 +15722,8 @@ public Builder setProtocol(
        * @return This builder for chaining.
        */
       public Builder clearProtocol() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         protocol_ = getDefaultInstance().getProtocol();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -16084,11 +15734,9 @@ public Builder clearProtocol() {
        */
       public Builder setProtocolBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         protocol_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -16143,11 +15791,9 @@ public java.lang.String getSystem() {
        */
       public Builder setSystem(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         system_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -16156,8 +15802,8 @@ public Builder setSystem(
        * @return This builder for chaining.
        */
       public Builder clearSystem() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         system_ = getDefaultInstance().getSystem();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -16168,11 +15814,9 @@ public Builder clearSystem() {
        */
       public Builder setSystemBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         system_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -16227,11 +15871,9 @@ public java.lang.String getHostname() {
        */
       public Builder setHostname(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         hostname_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -16240,8 +15882,8 @@ public Builder setHostname(
        * @return This builder for chaining.
        */
       public Builder clearHostname() {
-        bitField0_ = (bitField0_ & ~0x00000004);
         hostname_ = getDefaultInstance().getHostname();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -16252,11 +15894,9 @@ public Builder clearHostname() {
        */
       public Builder setHostnameBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         hostname_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -16266,6 +15906,7 @@ public Builder setHostnameBytes(
        * required uint32 port = 4;
        * @return Whether the port field is set.
        */
+      @java.lang.Override
       public boolean hasPort() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -16273,6 +15914,7 @@ public boolean hasPort() {
        * required uint32 port = 4;
        * @return The port.
        */
+      @java.lang.Override
       public int getPort() {
         return port_;
       }
@@ -16282,8 +15924,9 @@ public int getPort() {
        * @return This builder for chaining.
        */
       public Builder setPort(int value) {
-        bitField0_ |= 0x00000008;
+
         port_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -16330,7 +15973,18 @@ public Address parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Address(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -16374,7 +16028,7 @@ public interface StartEntityOrBuilder extends
   /**
    * Protobuf type {@code StartEntity}
    */
-  public  static final class StartEntity extends
+  public static final class StartEntity extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:StartEntity)
       StartEntityOrBuilder {
@@ -16394,55 +16048,6 @@ protected java.lang.Object newInstance(
       return new StartEntity();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private StartEntity(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              entityId_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntity_descriptor;
@@ -16458,11 +16063,13 @@ private StartEntity(
 
     private int bitField0_;
     public static final int ENTITYID_FIELD_NUMBER = 1;
-    private volatile java.lang.Object entityId_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object entityId_ = "";
     /**
      * required string entityId = 1;
      * @return Whether the entityId field is set.
      */
+    @java.lang.Override
     public boolean hasEntityId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -16470,6 +16077,7 @@ public boolean hasEntityId() {
      * required string entityId = 1;
      * @return The entityId.
      */
+    @java.lang.Override
     public java.lang.String getEntityId() {
       java.lang.Object ref = entityId_;
       if (ref instanceof java.lang.String) {
@@ -16488,6 +16096,7 @@ public java.lang.String getEntityId() {
      * required string entityId = 1;
      * @return The bytes for entityId.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdBytes() {
       java.lang.Object ref = entityId_;
@@ -16523,7 +16132,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entityId_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -16535,7 +16144,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000001) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, entityId_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -16555,7 +16164,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getEntityId()
             .equals(other.getEntityId())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -16570,7 +16179,7 @@ public int hashCode() {
         hash = (37 * hash) + ENTITYID_FIELD_NUMBER;
         hash = (53 * hash) + getEntityId().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -16619,11 +16228,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -16687,24 +16298,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         entityId_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -16731,15 +16337,19 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.St
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.entityId_ = entityId_;
           to_bitField0_ |= 0x00000001;
         }
-        result.entityId_ = entityId_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -16787,11 +16397,11 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity other) {
         if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity.getDefaultInstance()) return this;
         if (other.hasEntityId()) {
-          bitField0_ |= 0x00000001;
           entityId_ = other.entityId_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -16809,17 +16419,35 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                entityId_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -16874,11 +16502,9 @@ public java.lang.String getEntityId() {
        */
       public Builder setEntityId(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         entityId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -16887,8 +16513,8 @@ public Builder setEntityId(
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         entityId_ = getDefaultInstance().getEntityId();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -16899,11 +16525,9 @@ public Builder clearEntityId() {
        */
       public Builder setEntityIdBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         entityId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -16940,7 +16564,18 @@ public StartEntity parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new StartEntity(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -17001,7 +16636,7 @@ public interface StartEntityAckOrBuilder extends
   /**
    * Protobuf type {@code StartEntityAck}
    */
-  public  static final class StartEntityAck extends
+  public static final class StartEntityAck extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:StartEntityAck)
       StartEntityAckOrBuilder {
@@ -17022,61 +16657,6 @@ protected java.lang.Object newInstance(
       return new StartEntityAck();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private StartEntityAck(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              entityId_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              shardId_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntityAck_descriptor;
@@ -17092,11 +16672,13 @@ private StartEntityAck(
 
     private int bitField0_;
     public static final int ENTITYID_FIELD_NUMBER = 1;
-    private volatile java.lang.Object entityId_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object entityId_ = "";
     /**
      * required string entityId = 1;
      * @return Whether the entityId field is set.
      */
+    @java.lang.Override
     public boolean hasEntityId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -17104,6 +16686,7 @@ public boolean hasEntityId() {
      * required string entityId = 1;
      * @return The entityId.
      */
+    @java.lang.Override
     public java.lang.String getEntityId() {
       java.lang.Object ref = entityId_;
       if (ref instanceof java.lang.String) {
@@ -17122,6 +16705,7 @@ public java.lang.String getEntityId() {
      * required string entityId = 1;
      * @return The bytes for entityId.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdBytes() {
       java.lang.Object ref = entityId_;
@@ -17137,11 +16721,13 @@ public java.lang.String getEntityId() {
     }
 
     public static final int SHARDID_FIELD_NUMBER = 2;
-    private volatile java.lang.Object shardId_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object shardId_ = "";
     /**
      * required string shardId = 2;
      * @return Whether the shardId field is set.
      */
+    @java.lang.Override
     public boolean hasShardId() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -17149,6 +16735,7 @@ public boolean hasShardId() {
      * required string shardId = 2;
      * @return The shardId.
      */
+    @java.lang.Override
     public java.lang.String getShardId() {
       java.lang.Object ref = shardId_;
       if (ref instanceof java.lang.String) {
@@ -17167,6 +16754,7 @@ public java.lang.String getShardId() {
      * required string shardId = 2;
      * @return The bytes for shardId.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getShardIdBytes() {
       java.lang.Object ref = shardId_;
@@ -17209,7 +16797,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, shardId_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -17224,7 +16812,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000002) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, shardId_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -17249,7 +16837,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getShardId()
             .equals(other.getShardId())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -17268,7 +16856,7 @@ public int hashCode() {
         hash = (37 * hash) + SHARDID_FIELD_NUMBER;
         hash = (53 * hash) + getShardId().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -17317,11 +16905,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -17385,26 +16975,20 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         entityId_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         shardId_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -17431,19 +17015,23 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.St
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.entityId_ = entityId_;
           to_bitField0_ |= 0x00000001;
         }
-        result.entityId_ = entityId_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.shardId_ = shardId_;
           to_bitField0_ |= 0x00000002;
         }
-        result.shardId_ = shardId_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -17491,16 +17079,16 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck other) {
         if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck.getDefaultInstance()) return this;
         if (other.hasEntityId()) {
-          bitField0_ |= 0x00000001;
           entityId_ = other.entityId_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasShardId()) {
-          bitField0_ |= 0x00000002;
           shardId_ = other.shardId_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -17521,17 +17109,40 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                entityId_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                shardId_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -17586,11 +17197,9 @@ public java.lang.String getEntityId() {
        */
       public Builder setEntityId(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         entityId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -17599,8 +17208,8 @@ public Builder setEntityId(
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         entityId_ = getDefaultInstance().getEntityId();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -17611,11 +17220,9 @@ public Builder clearEntityId() {
        */
       public Builder setEntityIdBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         entityId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -17670,11 +17277,9 @@ public java.lang.String getShardId() {
        */
       public Builder setShardId(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         shardId_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -17683,8 +17288,8 @@ public Builder setShardId(
        * @return This builder for chaining.
        */
       public Builder clearShardId() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         shardId_ = getDefaultInstance().getShardId();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -17695,11 +17300,9 @@ public Builder clearShardId() {
        */
       public Builder setShardIdBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         shardId_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -17736,7 +17339,18 @@ public StartEntityAck parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new StartEntityAck(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -17805,7 +17419,7 @@ public interface CurrentShardStateOrBuilder extends
   /**
    * Protobuf type {@code CurrentShardState}
    */
-  public  static final class CurrentShardState extends
+  public static final class CurrentShardState extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:CurrentShardState)
       CurrentShardStateOrBuilder {
@@ -17816,7 +17430,8 @@ private CurrentShardState(org.apache.pekko.protobufv3.internal.GeneratedMessageV
     }
     private CurrentShardState() {
       shardId_ = "";
-      entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      entityIds_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -17826,67 +17441,6 @@ protected java.lang.Object newInstance(
       return new CurrentShardState();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private CurrentShardState(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              shardId_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                entityIds_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              entityIds_.add(bs);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          entityIds_ = entityIds_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardState_descriptor;
@@ -17902,11 +17456,13 @@ private CurrentShardState(
 
     private int bitField0_;
     public static final int SHARDID_FIELD_NUMBER = 1;
-    private volatile java.lang.Object shardId_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object shardId_ = "";
     /**
      * required string shardId = 1;
      * @return Whether the shardId field is set.
      */
+    @java.lang.Override
     public boolean hasShardId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -17914,6 +17470,7 @@ public boolean hasShardId() {
      * required string shardId = 1;
      * @return The shardId.
      */
+    @java.lang.Override
     public java.lang.String getShardId() {
       java.lang.Object ref = shardId_;
       if (ref instanceof java.lang.String) {
@@ -17932,6 +17489,7 @@ public java.lang.String getShardId() {
      * required string shardId = 1;
      * @return The bytes for shardId.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getShardIdBytes() {
       java.lang.Object ref = shardId_;
@@ -17947,7 +17505,9 @@ public java.lang.String getShardId() {
     }
 
     public static final int ENTITYIDS_FIELD_NUMBER = 2;
-    private org.apache.pekko.protobufv3.internal.LazyStringList entityIds_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList entityIds_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string entityIds = 2;
      * @return A list containing the entityIds.
@@ -18005,7 +17565,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < entityIds_.size(); i++) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, entityIds_.getRaw(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -18025,7 +17585,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getEntityIdsList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -18047,7 +17607,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getEntityIdsList()
           .equals(other.getEntityIdsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -18066,7 +17626,7 @@ public int hashCode() {
         hash = (37 * hash) + ENTITYIDS_FIELD_NUMBER;
         hash = (53 * hash) + getEntityIdsList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -18115,11 +17675,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -18183,26 +17745,21 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         shardId_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
-        entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        entityIds_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         return this;
       }
 
@@ -18229,20 +17786,23 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Cu
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.shardId_ = shardId_;
           to_bitField0_ |= 0x00000001;
         }
-        result.shardId_ = shardId_;
-        if (((bitField0_ & 0x00000002) != 0)) {
-          entityIds_ = entityIds_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000002);
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          entityIds_.makeImmutable();
+          result.entityIds_ = entityIds_;
         }
-        result.entityIds_ = entityIds_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -18290,21 +17850,21 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState other) {
         if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState.getDefaultInstance()) return this;
         if (other.hasShardId()) {
-          bitField0_ |= 0x00000001;
           shardId_ = other.shardId_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.entityIds_.isEmpty()) {
           if (entityIds_.isEmpty()) {
             entityIds_ = other.entityIds_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ |= 0x00000002;
           } else {
             ensureEntityIdsIsMutable();
             entityIds_.addAll(other.entityIds_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -18322,17 +17882,41 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                shardId_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureEntityIdsIsMutable();
+                entityIds_.add(bs);
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -18387,11 +17971,9 @@ public java.lang.String getShardId() {
        */
       public Builder setShardId(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         shardId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -18400,8 +17982,8 @@ public Builder setShardId(
        * @return This builder for chaining.
        */
       public Builder clearShardId() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         shardId_ = getDefaultInstance().getShardId();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -18412,21 +17994,20 @@ public Builder clearShardId() {
        */
       public Builder setShardIdBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         shardId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList entityIds_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureEntityIdsIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!entityIds_.isModifiable()) {
           entityIds_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(entityIds_);
-          bitField0_ |= 0x00000002;
-         }
+        }
+        bitField0_ |= 0x00000002;
       }
       /**
        * repeated string entityIds = 2;
@@ -18434,7 +18015,8 @@ private void ensureEntityIdsIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getEntityIdsList() {
-        return entityIds_.getUnmodifiableView();
+        entityIds_.makeImmutable();
+        return entityIds_;
       }
       /**
        * repeated string entityIds = 2;
@@ -18468,11 +18050,10 @@ public java.lang.String getEntityIds(int index) {
        */
       public Builder setEntityIds(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureEntityIdsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureEntityIdsIsMutable();
         entityIds_.set(index, value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -18483,11 +18064,10 @@ public Builder setEntityIds(
        */
       public Builder addEntityIds(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureEntityIdsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureEntityIdsIsMutable();
         entityIds_.add(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -18501,6 +18081,7 @@ public Builder addAllEntityIds(
         ensureEntityIdsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, entityIds_);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -18509,8 +18090,9 @@ public Builder addAllEntityIds(
        * @return This builder for chaining.
        */
       public Builder clearEntityIds() {
-        entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        entityIds_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);;
         onChanged();
         return this;
       }
@@ -18521,11 +18103,10 @@ public Builder clearEntityIds() {
        */
       public Builder addEntityIdsBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureEntityIdsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureEntityIdsIsMutable();
         entityIds_.add(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -18562,7 +18143,18 @@ public CurrentShardState parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new CurrentShardState(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -18631,7 +18223,7 @@ public interface ShardStateOrBuilder extends
   /**
    * Protobuf type {@code ShardState}
    */
-  public  static final class ShardState extends
+  public static final class ShardState extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ShardState)
       ShardStateOrBuilder {
@@ -18642,7 +18234,8 @@ private ShardState(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Build
     }
     private ShardState() {
       shardId_ = "";
-      entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      entityIds_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -18651,68 +18244,7 @@ protected java.lang.Object newInstance(
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ShardState();
     }
-
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ShardState(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              shardId_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                entityIds_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              entityIds_.add(bs);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          entityIds_ = entityIds_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
+
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardState_descriptor;
@@ -18728,11 +18260,13 @@ private ShardState(
 
     private int bitField0_;
     public static final int SHARDID_FIELD_NUMBER = 1;
-    private volatile java.lang.Object shardId_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object shardId_ = "";
     /**
      * required string shardId = 1;
      * @return Whether the shardId field is set.
      */
+    @java.lang.Override
     public boolean hasShardId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -18740,6 +18274,7 @@ public boolean hasShardId() {
      * required string shardId = 1;
      * @return The shardId.
      */
+    @java.lang.Override
     public java.lang.String getShardId() {
       java.lang.Object ref = shardId_;
       if (ref instanceof java.lang.String) {
@@ -18758,6 +18293,7 @@ public java.lang.String getShardId() {
      * required string shardId = 1;
      * @return The bytes for shardId.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getShardIdBytes() {
       java.lang.Object ref = shardId_;
@@ -18773,7 +18309,9 @@ public java.lang.String getShardId() {
     }
 
     public static final int ENTITYIDS_FIELD_NUMBER = 2;
-    private org.apache.pekko.protobufv3.internal.LazyStringList entityIds_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList entityIds_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string entityIds = 2;
      * @return A list containing the entityIds.
@@ -18831,7 +18369,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < entityIds_.size(); i++) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, entityIds_.getRaw(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -18851,7 +18389,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getEntityIdsList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -18873,7 +18411,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getEntityIdsList()
           .equals(other.getEntityIdsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -18892,7 +18430,7 @@ public int hashCode() {
         hash = (37 * hash) + ENTITYIDS_FIELD_NUMBER;
         hash = (53 * hash) + getEntityIdsList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -18941,11 +18479,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -19009,26 +18549,21 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         shardId_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
-        entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        entityIds_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         return this;
       }
 
@@ -19055,20 +18590,23 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Sh
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.shardId_ = shardId_;
           to_bitField0_ |= 0x00000001;
         }
-        result.shardId_ = shardId_;
-        if (((bitField0_ & 0x00000002) != 0)) {
-          entityIds_ = entityIds_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000002);
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          entityIds_.makeImmutable();
+          result.entityIds_ = entityIds_;
         }
-        result.entityIds_ = entityIds_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -19116,21 +18654,21 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState other) {
         if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.getDefaultInstance()) return this;
         if (other.hasShardId()) {
-          bitField0_ |= 0x00000001;
           shardId_ = other.shardId_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.entityIds_.isEmpty()) {
           if (entityIds_.isEmpty()) {
             entityIds_ = other.entityIds_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ |= 0x00000002;
           } else {
             ensureEntityIdsIsMutable();
             entityIds_.addAll(other.entityIds_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -19148,17 +18686,41 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                shardId_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureEntityIdsIsMutable();
+                entityIds_.add(bs);
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -19213,11 +18775,9 @@ public java.lang.String getShardId() {
        */
       public Builder setShardId(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         shardId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -19226,8 +18786,8 @@ public Builder setShardId(
        * @return This builder for chaining.
        */
       public Builder clearShardId() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         shardId_ = getDefaultInstance().getShardId();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -19238,21 +18798,20 @@ public Builder clearShardId() {
        */
       public Builder setShardIdBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         shardId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList entityIds_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureEntityIdsIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!entityIds_.isModifiable()) {
           entityIds_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(entityIds_);
-          bitField0_ |= 0x00000002;
-         }
+        }
+        bitField0_ |= 0x00000002;
       }
       /**
        * repeated string entityIds = 2;
@@ -19260,7 +18819,8 @@ private void ensureEntityIdsIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getEntityIdsList() {
-        return entityIds_.getUnmodifiableView();
+        entityIds_.makeImmutable();
+        return entityIds_;
       }
       /**
        * repeated string entityIds = 2;
@@ -19294,11 +18854,10 @@ public java.lang.String getEntityIds(int index) {
        */
       public Builder setEntityIds(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureEntityIdsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureEntityIdsIsMutable();
         entityIds_.set(index, value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -19309,11 +18868,10 @@ public Builder setEntityIds(
        */
       public Builder addEntityIds(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureEntityIdsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureEntityIdsIsMutable();
         entityIds_.add(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -19327,6 +18885,7 @@ public Builder addAllEntityIds(
         ensureEntityIdsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, entityIds_);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -19335,8 +18894,9 @@ public Builder addAllEntityIds(
        * @return This builder for chaining.
        */
       public Builder clearEntityIds() {
-        entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        entityIds_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);;
         onChanged();
         return this;
       }
@@ -19347,11 +18907,10 @@ public Builder clearEntityIds() {
        */
       public Builder addEntityIdsBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureEntityIdsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureEntityIdsIsMutable();
         entityIds_.add(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -19388,7 +18947,18 @@ public ShardState parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ShardState(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -19464,7 +19034,7 @@ org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStat
   /**
    * Protobuf type {@code CurrentShardRegionState}
    */
-  public  static final class CurrentShardRegionState extends
+  public static final class CurrentShardRegionState extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:CurrentShardRegionState)
       CurrentShardRegionStateOrBuilder {
@@ -19475,7 +19045,8 @@ private CurrentShardRegionState(org.apache.pekko.protobufv3.internal.GeneratedMe
     }
     private CurrentShardRegionState() {
       shards_ = java.util.Collections.emptyList();
-      failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      failed_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -19485,73 +19056,6 @@ protected java.lang.Object newInstance(
       return new CurrentShardRegionState();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private CurrentShardRegionState(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                shards_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              shards_.add(
-                  input.readMessage(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.PARSER, extensionRegistry));
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                failed_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              failed_.add(bs);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          shards_ = java.util.Collections.unmodifiableList(shards_);
-        }
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          failed_ = failed_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardRegionState_descriptor;
@@ -19566,16 +19070,19 @@ private CurrentShardRegionState(
     }
 
     public static final int SHARDS_FIELD_NUMBER = 1;
+    @SuppressWarnings("serial")
     private java.util.List shards_;
     /**
      * repeated .ShardState shards = 1;
      */
+    @java.lang.Override
     public java.util.List getShardsList() {
       return shards_;
     }
     /**
      * repeated .ShardState shards = 1;
      */
+    @java.lang.Override
     public java.util.List 
         getShardsOrBuilderList() {
       return shards_;
@@ -19583,25 +19090,30 @@ public java.util.Listrepeated .ShardState shards = 1;
      */
+    @java.lang.Override
     public int getShardsCount() {
       return shards_.size();
     }
     /**
      * repeated .ShardState shards = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState getShards(int index) {
       return shards_.get(index);
     }
     /**
      * repeated .ShardState shards = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStateOrBuilder getShardsOrBuilder(
         int index) {
       return shards_.get(index);
     }
 
     public static final int FAILED_FIELD_NUMBER = 2;
-    private org.apache.pekko.protobufv3.internal.LazyStringList failed_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList failed_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string failed = 2;
      * @return A list containing the failed.
@@ -19661,7 +19173,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < failed_.size(); i++) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, failed_.getRaw(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -19682,7 +19194,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getFailedList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -19701,7 +19213,7 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getShardsList())) return false;
       if (!getFailedList()
           .equals(other.getFailedList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -19720,7 +19232,7 @@ public int hashCode() {
         hash = (37 * hash) + FAILED_FIELD_NUMBER;
         hash = (53 * hash) + getFailedList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -19769,11 +19281,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -19837,31 +19351,27 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getShardsFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (shardsBuilder_ == null) {
           shards_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
+          shards_ = null;
           shardsBuilder_.clear();
         }
-        failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
+        failed_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         return this;
       }
 
@@ -19888,7 +19398,13 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Cu
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState(this);
-        int from_bitField0_ = bitField0_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState result) {
         if (shardsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             shards_ = java.util.Collections.unmodifiableList(shards_);
@@ -19898,13 +19414,14 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Cu
         } else {
           result.shards_ = shardsBuilder_.build();
         }
-        if (((bitField0_ & 0x00000002) != 0)) {
-          failed_ = failed_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000002);
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          failed_.makeImmutable();
+          result.failed_ = failed_;
         }
-        result.failed_ = failed_;
-        onBuilt();
-        return result;
       }
 
       @java.lang.Override
@@ -19980,14 +19497,14 @@ public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterS
         if (!other.failed_.isEmpty()) {
           if (failed_.isEmpty()) {
             failed_ = other.failed_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ |= 0x00000002;
           } else {
             ensureFailedIsMutable();
             failed_.addAll(other.failed_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -20007,17 +19524,49 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.PARSER,
+                        extensionRegistry);
+                if (shardsBuilder_ == null) {
+                  ensureShardsIsMutable();
+                  shards_.add(m);
+                } else {
+                  shardsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+              case 18: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureFailedIsMutable();
+                failed_.add(bs);
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -20262,12 +19811,13 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Sh
         return shardsBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList failed_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureFailedIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!failed_.isModifiable()) {
           failed_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(failed_);
-          bitField0_ |= 0x00000002;
-         }
+        }
+        bitField0_ |= 0x00000002;
       }
       /**
        * repeated string failed = 2;
@@ -20275,7 +19825,8 @@ private void ensureFailedIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getFailedList() {
-        return failed_.getUnmodifiableView();
+        failed_.makeImmutable();
+        return failed_;
       }
       /**
        * repeated string failed = 2;
@@ -20309,11 +19860,10 @@ public java.lang.String getFailed(int index) {
        */
       public Builder setFailed(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureFailedIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureFailedIsMutable();
         failed_.set(index, value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -20324,11 +19874,10 @@ public Builder setFailed(
        */
       public Builder addFailed(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureFailedIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureFailedIsMutable();
         failed_.add(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -20342,6 +19891,7 @@ public Builder addAllFailed(
         ensureFailedIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, failed_);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -20350,8 +19900,9 @@ public Builder addAllFailed(
        * @return This builder for chaining.
        */
       public Builder clearFailed() {
-        failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        failed_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);;
         onChanged();
         return this;
       }
@@ -20362,11 +19913,10 @@ public Builder clearFailed() {
        */
       public Builder addFailedBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureFailedIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureFailedIsMutable();
         failed_.add(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -20403,7 +19953,18 @@ public CurrentShardRegionState parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new CurrentShardRegionState(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -20466,7 +20027,7 @@ public interface RememberedShardStateOrBuilder extends
   /**
    * Protobuf type {@code RememberedShardState}
    */
-  public  static final class RememberedShardState extends
+  public static final class RememberedShardState extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:RememberedShardState)
       RememberedShardStateOrBuilder {
@@ -20476,7 +20037,8 @@ private RememberedShardState(org.apache.pekko.protobufv3.internal.GeneratedMessa
       super(builder);
     }
     private RememberedShardState() {
-      shardId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      shardId_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -20486,66 +20048,6 @@ protected java.lang.Object newInstance(
       return new RememberedShardState();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private RememberedShardState(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                shardId_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              shardId_.add(bs);
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000001;
-              marker_ = input.readBool();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          shardId_ = shardId_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_RememberedShardState_descriptor;
@@ -20561,7 +20063,9 @@ private RememberedShardState(
 
     private int bitField0_;
     public static final int SHARDID_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.LazyStringList shardId_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList shardId_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string shardId = 1;
      * @return A list containing the shardId.
@@ -20596,11 +20100,12 @@ public java.lang.String getShardId(int index) {
     }
 
     public static final int MARKER_FIELD_NUMBER = 2;
-    private boolean marker_;
+    private boolean marker_ = false;
     /**
      * optional bool marker = 2;
      * @return Whether the marker field is set.
      */
+    @java.lang.Override
     public boolean hasMarker() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -20608,6 +20113,7 @@ public boolean hasMarker() {
      * optional bool marker = 2;
      * @return The marker.
      */
+    @java.lang.Override
     public boolean getMarker() {
       return marker_;
     }
@@ -20632,7 +20138,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeBool(2, marker_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -20653,7 +20159,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(2, marker_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -20675,7 +20181,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getMarker()
             != other.getMarker()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -20695,7 +20201,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getMarker());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -20744,11 +20250,13 @@ public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -20812,26 +20320,21 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        shardId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = 0;
+        shardId_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         marker_ = false;
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -20858,20 +20361,23 @@ public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Re
       @java.lang.Override
       public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState buildPartial() {
         org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState result) {
         int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          shardId_ = shardId_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000001);
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          shardId_.makeImmutable();
+          result.shardId_ = shardId_;
         }
-        result.shardId_ = shardId_;
+        int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.marker_ = marker_;
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -20921,7 +20427,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterS
         if (!other.shardId_.isEmpty()) {
           if (shardId_.isEmpty()) {
             shardId_ = other.shardId_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ |= 0x00000001;
           } else {
             ensureShardIdIsMutable();
             shardId_.addAll(other.shardId_);
@@ -20931,7 +20437,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterS
         if (other.hasMarker()) {
           setMarker(other.getMarker());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -20946,27 +20452,52 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureShardIdIsMutable();
+                shardId_.add(bs);
+                break;
+              } // case 10
+              case 16: {
+                marker_ = input.readBool();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList shardId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList shardId_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureShardIdIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!shardId_.isModifiable()) {
           shardId_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(shardId_);
-          bitField0_ |= 0x00000001;
-         }
+        }
+        bitField0_ |= 0x00000001;
       }
       /**
        * repeated string shardId = 1;
@@ -20974,7 +20505,8 @@ private void ensureShardIdIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getShardIdList() {
-        return shardId_.getUnmodifiableView();
+        shardId_.makeImmutable();
+        return shardId_;
       }
       /**
        * repeated string shardId = 1;
@@ -21008,11 +20540,10 @@ public java.lang.String getShardId(int index) {
        */
       public Builder setShardId(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureShardIdIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureShardIdIsMutable();
         shardId_.set(index, value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -21023,11 +20554,10 @@ public Builder setShardId(
        */
       public Builder addShardId(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureShardIdIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureShardIdIsMutable();
         shardId_.add(value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -21041,6 +20571,7 @@ public Builder addAllShardId(
         ensureShardIdIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, shardId_);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -21049,8 +20580,9 @@ public Builder addAllShardId(
        * @return This builder for chaining.
        */
       public Builder clearShardId() {
-        shardId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        shardId_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);;
         onChanged();
         return this;
       }
@@ -21061,11 +20593,10 @@ public Builder clearShardId() {
        */
       public Builder addShardIdBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureShardIdIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureShardIdIsMutable();
         shardId_.add(value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -21075,6 +20606,7 @@ public Builder addShardIdBytes(
        * optional bool marker = 2;
        * @return Whether the marker field is set.
        */
+      @java.lang.Override
       public boolean hasMarker() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -21082,6 +20614,7 @@ public boolean hasMarker() {
        * optional bool marker = 2;
        * @return The marker.
        */
+      @java.lang.Override
       public boolean getMarker() {
         return marker_;
       }
@@ -21091,8 +20624,9 @@ public boolean getMarker() {
        * @return This builder for chaining.
        */
       public Builder setMarker(boolean value) {
-        bitField0_ |= 0x00000002;
+
         marker_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -21139,7 +20673,18 @@ public RememberedShardState parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new RememberedShardState(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
diff --git a/cluster-tools/src/main/java/org/apache/pekko/cluster/client/protobuf/msg/ClusterClientMessages.java b/cluster-tools/src/main/java/org/apache/pekko/cluster/client/protobuf/msg/ClusterClientMessages.java
index cfa0db9ef8e..638093cf9c7 100644
--- a/cluster-tools/src/main/java/org/apache/pekko/cluster/client/protobuf/msg/ClusterClientMessages.java
+++ b/cluster-tools/src/main/java/org/apache/pekko/cluster/client/protobuf/msg/ClusterClientMessages.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2020-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ClusterClientMessages.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.cluster.client.protobuf.msg;
 
 public final class ClusterClientMessages {
@@ -59,7 +60,7 @@ public interface ContactsOrBuilder extends
   /**
    * Protobuf type {@code Contacts}
    */
-  public  static final class Contacts extends
+  public static final class Contacts extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Contacts)
       ContactsOrBuilder {
@@ -69,7 +70,8 @@ private Contacts(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
       super(builder);
     }
     private Contacts() {
-      contactPoints_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      contactPoints_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -79,61 +81,6 @@ protected java.lang.Object newInstance(
       return new Contacts();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Contacts(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                contactPoints_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              contactPoints_.add(bs);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          contactPoints_ = contactPoints_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.internal_static_Contacts_descriptor;
@@ -148,7 +95,9 @@ private Contacts(
     }
 
     public static final int CONTACTPOINTS_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.LazyStringList contactPoints_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList contactPoints_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string contactPoints = 1;
      * @return A list containing the contactPoints.
@@ -199,7 +148,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < contactPoints_.size(); i++) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, contactPoints_.getRaw(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -216,7 +165,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getContactPointsList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -233,7 +182,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getContactPointsList()
           .equals(other.getContactPointsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -248,7 +197,7 @@ public int hashCode() {
         hash = (37 * hash) + CONTACTPOINTS_FIELD_NUMBER;
         hash = (53 * hash) + getContactPointsList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -297,11 +246,13 @@ public static org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -365,24 +316,20 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        contactPoints_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = 0;
+        contactPoints_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         return this;
       }
 
@@ -409,16 +356,19 @@ public org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contac
       @java.lang.Override
       public org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts buildPartial() {
         org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts result = new org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts(this);
-        int from_bitField0_ = bitField0_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          contactPoints_ = contactPoints_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.contactPoints_ = contactPoints_;
+        if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          contactPoints_.makeImmutable();
+          result.contactPoints_ = contactPoints_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -466,14 +416,14 @@ public Builder mergeFrom(org.apache.pekko.cluster.client.protobuf.msg.ClusterCli
         if (!other.contactPoints_.isEmpty()) {
           if (contactPoints_.isEmpty()) {
             contactPoints_ = other.contactPoints_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ |= 0x00000001;
           } else {
             ensureContactPointsIsMutable();
             contactPoints_.addAll(other.contactPoints_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -488,27 +438,47 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureContactPointsIsMutable();
+                contactPoints_.add(bs);
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList contactPoints_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList contactPoints_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureContactPointsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!contactPoints_.isModifiable()) {
           contactPoints_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(contactPoints_);
-          bitField0_ |= 0x00000001;
-         }
+        }
+        bitField0_ |= 0x00000001;
       }
       /**
        * repeated string contactPoints = 1;
@@ -516,7 +486,8 @@ private void ensureContactPointsIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getContactPointsList() {
-        return contactPoints_.getUnmodifiableView();
+        contactPoints_.makeImmutable();
+        return contactPoints_;
       }
       /**
        * repeated string contactPoints = 1;
@@ -550,11 +521,10 @@ public java.lang.String getContactPoints(int index) {
        */
       public Builder setContactPoints(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureContactPointsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureContactPointsIsMutable();
         contactPoints_.set(index, value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -565,11 +535,10 @@ public Builder setContactPoints(
        */
       public Builder addContactPoints(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureContactPointsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureContactPointsIsMutable();
         contactPoints_.add(value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -583,6 +552,7 @@ public Builder addAllContactPoints(
         ensureContactPointsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, contactPoints_);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -591,8 +561,9 @@ public Builder addAllContactPoints(
        * @return This builder for chaining.
        */
       public Builder clearContactPoints() {
-        contactPoints_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        contactPoints_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);;
         onChanged();
         return this;
       }
@@ -603,11 +574,10 @@ public Builder clearContactPoints() {
        */
       public Builder addContactPointsBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureContactPointsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureContactPointsIsMutable();
         contactPoints_.add(value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -644,7 +614,18 @@ public Contacts parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Contacts(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
diff --git a/cluster-tools/src/main/java/org/apache/pekko/cluster/pubsub/protobuf/msg/DistributedPubSubMessages.java b/cluster-tools/src/main/java/org/apache/pekko/cluster/pubsub/protobuf/msg/DistributedPubSubMessages.java
index 192e46cec7e..53d5a3b8981 100644
--- a/cluster-tools/src/main/java/org/apache/pekko/cluster/pubsub/protobuf/msg/DistributedPubSubMessages.java
+++ b/cluster-tools/src/main/java/org/apache/pekko/cluster/pubsub/protobuf/msg/DistributedPubSubMessages.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2020-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: DistributedPubSubMessages.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.cluster.pubsub.protobuf.msg;
 
 public final class DistributedPubSubMessages {
@@ -69,7 +70,7 @@ org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Ve
   /**
    * Protobuf type {@code Status}
    */
-  public  static final class Status extends
+  public static final class Status extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Status)
       StatusOrBuilder {
@@ -89,66 +90,6 @@ protected java.lang.Object newInstance(
       return new Status();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Status(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                versions_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              versions_.add(
-                  input.readMessage(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.PARSER, extensionRegistry));
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000001;
-              replyToStatus_ = input.readBool();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          versions_ = java.util.Collections.unmodifiableList(versions_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_descriptor;
@@ -195,7 +136,7 @@ public interface VersionOrBuilder extends
     /**
      * Protobuf type {@code Status.Version}
      */
-    public  static final class Version extends
+    public static final class Version extends
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:Status.Version)
         VersionOrBuilder {
@@ -214,67 +155,6 @@ protected java.lang.Object newInstance(
         return new Version();
       }
 
-      @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private Version(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10: {
-                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000001) != 0)) {
-                  subBuilder = address_.toBuilder();
-                }
-                address_ = input.readMessage(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(address_);
-                  address_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000001;
-                break;
-              }
-              case 16: {
-                bitField0_ |= 0x00000002;
-                timestamp_ = input.readInt64();
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_descriptor;
@@ -295,6 +175,7 @@ private Version(
        * required .Address address = 1;
        * @return Whether the address field is set.
        */
+      @java.lang.Override
       public boolean hasAddress() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -302,22 +183,25 @@ public boolean hasAddress() {
        * required .Address address = 1;
        * @return The address.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getAddress() {
         return address_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance() : address_;
       }
       /**
        * required .Address address = 1;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getAddressOrBuilder() {
         return address_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance() : address_;
       }
 
       public static final int TIMESTAMP_FIELD_NUMBER = 2;
-      private long timestamp_;
+      private long timestamp_ = 0L;
       /**
        * required int64 timestamp = 2;
        * @return Whether the timestamp field is set.
        */
+      @java.lang.Override
       public boolean hasTimestamp() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -325,6 +209,7 @@ public boolean hasTimestamp() {
        * required int64 timestamp = 2;
        * @return The timestamp.
        */
+      @java.lang.Override
       public long getTimestamp() {
         return timestamp_;
       }
@@ -361,7 +246,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeInt64(2, timestamp_);
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -378,7 +263,7 @@ public int getSerializedSize() {
           size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeInt64Size(2, timestamp_);
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -403,7 +288,7 @@ public boolean equals(final java.lang.Object obj) {
           if (getTimestamp()
               != other.getTimestamp()) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -423,7 +308,7 @@ public int hashCode() {
           hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               getTimestamp());
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -472,11 +357,13 @@ public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMess
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
+
       public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
+
       public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseDelimitedFrom(
           java.io.InputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -557,14 +444,13 @@ private void maybeForceBuilderInitialization() {
         @java.lang.Override
         public Builder clear() {
           super.clear();
-          if (addressBuilder_ == null) {
-            address_ = null;
-          } else {
-            addressBuilder_.clear();
+          bitField0_ = 0;
+          address_ = null;
+          if (addressBuilder_ != null) {
+            addressBuilder_.dispose();
+            addressBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000001);
           timestamp_ = 0L;
-          bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
@@ -591,23 +477,25 @@ public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.St
         @java.lang.Override
         public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version buildPartial() {
           org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
-            if (addressBuilder_ == null) {
-              result.address_ = address_;
-            } else {
-              result.address_ = addressBuilder_.build();
-            }
+            result.address_ = addressBuilder_ == null
+                ? address_
+                : addressBuilder_.build();
             to_bitField0_ |= 0x00000001;
           }
           if (((from_bitField0_ & 0x00000002) != 0)) {
             result.timestamp_ = timestamp_;
             to_bitField0_ |= 0x00000002;
           }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -660,7 +548,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.Distribute
           if (other.hasTimestamp()) {
             setTimestamp(other.getTimestamp());
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -684,17 +572,42 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 10: {
+                  input.readMessage(
+                      getAddressFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+                case 16: {
+                  timestamp_ = input.readInt64();
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 16
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
         private int bitField0_;
@@ -729,11 +642,11 @@ public Builder setAddress(org.apache.pekko.cluster.pubsub.protobuf.msg.Distribut
               throw new NullPointerException();
             }
             address_ = value;
-            onChanged();
           } else {
             addressBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000001;
+          onChanged();
           return this;
         }
         /**
@@ -743,11 +656,11 @@ public Builder setAddress(
             org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder builderForValue) {
           if (addressBuilder_ == null) {
             address_ = builderForValue.build();
-            onChanged();
           } else {
             addressBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000001;
+          onChanged();
           return this;
         }
         /**
@@ -756,31 +669,32 @@ public Builder setAddress(
         public Builder mergeAddress(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address value) {
           if (addressBuilder_ == null) {
             if (((bitField0_ & 0x00000001) != 0) &&
-                address_ != null &&
-                address_ != org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance()) {
-              address_ =
-                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.newBuilder(address_).mergeFrom(value).buildPartial();
+              address_ != null &&
+              address_ != org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance()) {
+              getAddressBuilder().mergeFrom(value);
             } else {
               address_ = value;
             }
-            onChanged();
           } else {
             addressBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000001;
+          if (address_ != null) {
+            bitField0_ |= 0x00000001;
+            onChanged();
+          }
           return this;
         }
         /**
          * required .Address address = 1;
          */
         public Builder clearAddress() {
-          if (addressBuilder_ == null) {
-            address_ = null;
-            onChanged();
-          } else {
-            addressBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000001);
+          address_ = null;
+          if (addressBuilder_ != null) {
+            addressBuilder_.dispose();
+            addressBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -824,6 +738,7 @@ public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Ad
          * required int64 timestamp = 2;
          * @return Whether the timestamp field is set.
          */
+        @java.lang.Override
         public boolean hasTimestamp() {
           return ((bitField0_ & 0x00000002) != 0);
         }
@@ -831,6 +746,7 @@ public boolean hasTimestamp() {
          * required int64 timestamp = 2;
          * @return The timestamp.
          */
+        @java.lang.Override
         public long getTimestamp() {
           return timestamp_;
         }
@@ -840,8 +756,9 @@ public long getTimestamp() {
          * @return This builder for chaining.
          */
         public Builder setTimestamp(long value) {
-          bitField0_ |= 0x00000002;
+
           timestamp_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -888,7 +805,18 @@ public Version parsePartialFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-          return new Version(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
@@ -910,16 +838,19 @@ public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.St
 
     private int bitField0_;
     public static final int VERSIONS_FIELD_NUMBER = 1;
+    @SuppressWarnings("serial")
     private java.util.List versions_;
     /**
      * repeated .Status.Version versions = 1;
      */
+    @java.lang.Override
     public java.util.List getVersionsList() {
       return versions_;
     }
     /**
      * repeated .Status.Version versions = 1;
      */
+    @java.lang.Override
     public java.util.List 
         getVersionsOrBuilderList() {
       return versions_;
@@ -927,29 +858,33 @@ public java.util.Listrepeated .Status.Version versions = 1;
      */
+    @java.lang.Override
     public int getVersionsCount() {
       return versions_.size();
     }
     /**
      * repeated .Status.Version versions = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version getVersions(int index) {
       return versions_.get(index);
     }
     /**
      * repeated .Status.Version versions = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder getVersionsOrBuilder(
         int index) {
       return versions_.get(index);
     }
 
     public static final int REPLYTOSTATUS_FIELD_NUMBER = 2;
-    private boolean replyToStatus_;
+    private boolean replyToStatus_ = false;
     /**
      * optional bool replyToStatus = 2;
      * @return Whether the replyToStatus field is set.
      */
+    @java.lang.Override
     public boolean hasReplyToStatus() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -957,6 +892,7 @@ public boolean hasReplyToStatus() {
      * optional bool replyToStatus = 2;
      * @return The replyToStatus.
      */
+    @java.lang.Override
     public boolean getReplyToStatus() {
       return replyToStatus_;
     }
@@ -987,7 +923,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeBool(2, replyToStatus_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -1004,7 +940,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(2, replyToStatus_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1026,7 +962,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getReplyToStatus()
             != other.getReplyToStatus()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1046,7 +982,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getReplyToStatus());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1095,11 +1031,13 @@ public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -1163,31 +1101,26 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getVersionsFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (versionsBuilder_ == null) {
           versions_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
+          versions_ = null;
           versionsBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000001);
         replyToStatus_ = false;
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -1214,8 +1147,13 @@ public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.St
       @java.lang.Override
       public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status buildPartial() {
         org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status result) {
         if (versionsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             versions_ = java.util.Collections.unmodifiableList(versions_);
@@ -1225,13 +1163,16 @@ public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.St
         } else {
           result.versions_ = versionsBuilder_.build();
         }
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.replyToStatus_ = replyToStatus_;
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1307,7 +1248,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.Distribute
         if (other.hasReplyToStatus()) {
           setReplyToStatus(other.getReplyToStatus());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1327,17 +1268,48 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.PARSER,
+                        extensionRegistry);
+                if (versionsBuilder_ == null) {
+                  ensureVersionsIsMutable();
+                  versions_.add(m);
+                } else {
+                  versionsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+              case 16: {
+                replyToStatus_ = input.readBool();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -1587,6 +1559,7 @@ public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.St
        * optional bool replyToStatus = 2;
        * @return Whether the replyToStatus field is set.
        */
+      @java.lang.Override
       public boolean hasReplyToStatus() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -1594,6 +1567,7 @@ public boolean hasReplyToStatus() {
        * optional bool replyToStatus = 2;
        * @return The replyToStatus.
        */
+      @java.lang.Override
       public boolean getReplyToStatus() {
         return replyToStatus_;
       }
@@ -1603,8 +1577,9 @@ public boolean getReplyToStatus() {
        * @return This builder for chaining.
        */
       public Builder setReplyToStatus(boolean value) {
-        bitField0_ |= 0x00000002;
+
         replyToStatus_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1651,7 +1626,18 @@ public Status parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Status(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -1702,7 +1688,7 @@ org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Buc
   /**
    * Protobuf type {@code Delta}
    */
-  public  static final class Delta extends
+  public static final class Delta extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Delta)
       DeltaOrBuilder {
@@ -1722,61 +1708,6 @@ protected java.lang.Object newInstance(
       return new Delta();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Delta(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                buckets_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              buckets_.add(
-                  input.readMessage(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          buckets_ = java.util.Collections.unmodifiableList(buckets_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_descriptor;
@@ -1842,7 +1773,7 @@ public interface EntryOrBuilder extends
     /**
      * Protobuf type {@code Delta.Entry}
      */
-    public  static final class Entry extends
+    public static final class Entry extends
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:Delta.Entry)
         EntryOrBuilder {
@@ -1863,66 +1794,6 @@ protected java.lang.Object newInstance(
         return new Entry();
       }
 
-      @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private Entry(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10: {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000001;
-                key_ = bs;
-                break;
-              }
-              case 16: {
-                bitField0_ |= 0x00000002;
-                version_ = input.readInt64();
-                break;
-              }
-              case 26: {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000004;
-                ref_ = bs;
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_descriptor;
@@ -1938,11 +1809,13 @@ private Entry(
 
       private int bitField0_;
       public static final int KEY_FIELD_NUMBER = 1;
-      private volatile java.lang.Object key_;
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object key_ = "";
       /**
        * required string key = 1;
        * @return Whether the key field is set.
        */
+      @java.lang.Override
       public boolean hasKey() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -1950,6 +1823,7 @@ public boolean hasKey() {
        * required string key = 1;
        * @return The key.
        */
+      @java.lang.Override
       public java.lang.String getKey() {
         java.lang.Object ref = key_;
         if (ref instanceof java.lang.String) {
@@ -1968,6 +1842,7 @@ public java.lang.String getKey() {
        * required string key = 1;
        * @return The bytes for key.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString
           getKeyBytes() {
         java.lang.Object ref = key_;
@@ -1983,11 +1858,12 @@ public java.lang.String getKey() {
       }
 
       public static final int VERSION_FIELD_NUMBER = 2;
-      private long version_;
+      private long version_ = 0L;
       /**
        * required int64 version = 2;
        * @return Whether the version field is set.
        */
+      @java.lang.Override
       public boolean hasVersion() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -1995,16 +1871,19 @@ public boolean hasVersion() {
        * required int64 version = 2;
        * @return The version.
        */
+      @java.lang.Override
       public long getVersion() {
         return version_;
       }
 
       public static final int REF_FIELD_NUMBER = 3;
-      private volatile java.lang.Object ref_;
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object ref_ = "";
       /**
        * optional string ref = 3;
        * @return Whether the ref field is set.
        */
+      @java.lang.Override
       public boolean hasRef() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -2012,6 +1891,7 @@ public boolean hasRef() {
        * optional string ref = 3;
        * @return The ref.
        */
+      @java.lang.Override
       public java.lang.String getRef() {
         java.lang.Object ref = ref_;
         if (ref instanceof java.lang.String) {
@@ -2030,6 +1910,7 @@ public java.lang.String getRef() {
        * optional string ref = 3;
        * @return The bytes for ref.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString
           getRefBytes() {
         java.lang.Object ref = ref_;
@@ -2075,7 +1956,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         if (((bitField0_ & 0x00000004) != 0)) {
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, ref_);
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -2094,7 +1975,7 @@ public int getSerializedSize() {
         if (((bitField0_ & 0x00000004) != 0)) {
           size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(3, ref_);
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -2124,7 +2005,7 @@ public boolean equals(final java.lang.Object obj) {
           if (!getRef()
               .equals(other.getRef())) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -2148,7 +2029,7 @@ public int hashCode() {
           hash = (37 * hash) + REF_FIELD_NUMBER;
           hash = (53 * hash) + getRef().hashCode();
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -2197,11 +2078,13 @@ public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMess
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
+
       public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
+
       public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseDelimitedFrom(
           java.io.InputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -2265,28 +2148,21 @@ public static final class Builder extends
 
         // Construct using org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.newBuilder()
         private Builder() {
-          maybeForceBuilderInitialization();
+
         }
 
         private Builder(
             org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
-          maybeForceBuilderInitialization();
-        }
-        private void maybeForceBuilderInitialization() {
-          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                  .alwaysUseFieldBuilders) {
-          }
+
         }
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           key_ = "";
-          bitField0_ = (bitField0_ & ~0x00000001);
           version_ = 0L;
-          bitField0_ = (bitField0_ & ~0x00000002);
           ref_ = "";
-          bitField0_ = (bitField0_ & ~0x00000004);
           return this;
         }
 
@@ -2313,23 +2189,27 @@ public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.De
         @java.lang.Override
         public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry buildPartial() {
           org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.key_ = key_;
             to_bitField0_ |= 0x00000001;
           }
-          result.key_ = key_;
           if (((from_bitField0_ & 0x00000002) != 0)) {
             result.version_ = version_;
             to_bitField0_ |= 0x00000002;
           }
           if (((from_bitField0_ & 0x00000004) != 0)) {
+            result.ref_ = ref_;
             to_bitField0_ |= 0x00000004;
           }
-          result.ref_ = ref_;
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -2377,19 +2257,19 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
         public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry other) {
           if (other == org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.getDefaultInstance()) return this;
           if (other.hasKey()) {
-            bitField0_ |= 0x00000001;
             key_ = other.key_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (other.hasVersion()) {
             setVersion(other.getVersion());
           }
           if (other.hasRef()) {
-            bitField0_ |= 0x00000004;
             ref_ = other.ref_;
+            bitField0_ |= 0x00000004;
             onChanged();
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -2410,17 +2290,45 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 10: {
+                  key_ = input.readBytes();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+                case 16: {
+                  version_ = input.readInt64();
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 16
+                case 26: {
+                  ref_ = input.readBytes();
+                  bitField0_ |= 0x00000004;
+                  break;
+                } // case 26
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
         private int bitField0_;
@@ -2475,11 +2383,9 @@ public java.lang.String getKey() {
          */
         public Builder setKey(
             java.lang.String value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+          if (value == null) { throw new NullPointerException(); }
           key_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -2488,8 +2394,8 @@ public Builder setKey(
          * @return This builder for chaining.
          */
         public Builder clearKey() {
-          bitField0_ = (bitField0_ & ~0x00000001);
           key_ = getDefaultInstance().getKey();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -2500,11 +2406,9 @@ public Builder clearKey() {
          */
         public Builder setKeyBytes(
             org.apache.pekko.protobufv3.internal.ByteString value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+          if (value == null) { throw new NullPointerException(); }
           key_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -2514,6 +2418,7 @@ public Builder setKeyBytes(
          * required int64 version = 2;
          * @return Whether the version field is set.
          */
+        @java.lang.Override
         public boolean hasVersion() {
           return ((bitField0_ & 0x00000002) != 0);
         }
@@ -2521,6 +2426,7 @@ public boolean hasVersion() {
          * required int64 version = 2;
          * @return The version.
          */
+        @java.lang.Override
         public long getVersion() {
           return version_;
         }
@@ -2530,8 +2436,9 @@ public long getVersion() {
          * @return This builder for chaining.
          */
         public Builder setVersion(long value) {
-          bitField0_ |= 0x00000002;
+
           version_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -2596,11 +2503,9 @@ public java.lang.String getRef() {
          */
         public Builder setRef(
             java.lang.String value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+          if (value == null) { throw new NullPointerException(); }
           ref_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -2609,8 +2514,8 @@ public Builder setRef(
          * @return This builder for chaining.
          */
         public Builder clearRef() {
-          bitField0_ = (bitField0_ & ~0x00000004);
           ref_ = getDefaultInstance().getRef();
+          bitField0_ = (bitField0_ & ~0x00000004);
           onChanged();
           return this;
         }
@@ -2621,11 +2526,9 @@ public Builder clearRef() {
          */
         public Builder setRefBytes(
             org.apache.pekko.protobufv3.internal.ByteString value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+          if (value == null) { throw new NullPointerException(); }
           ref_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -2662,7 +2565,18 @@ public Entry parsePartialFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-          return new Entry(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
@@ -2739,7 +2653,7 @@ org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Ent
     /**
      * Protobuf type {@code Delta.Bucket}
      */
-    public  static final class Bucket extends
+    public static final class Bucket extends
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:Delta.Bucket)
         BucketOrBuilder {
@@ -2759,79 +2673,6 @@ protected java.lang.Object newInstance(
         return new Bucket();
       }
 
-      @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private Bucket(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10: {
-                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000001) != 0)) {
-                  subBuilder = owner_.toBuilder();
-                }
-                owner_ = input.readMessage(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(owner_);
-                  owner_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000001;
-                break;
-              }
-              case 16: {
-                bitField0_ |= 0x00000002;
-                version_ = input.readInt64();
-                break;
-              }
-              case 26: {
-                if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                  content_ = new java.util.ArrayList();
-                  mutable_bitField0_ |= 0x00000004;
-                }
-                content_.add(
-                    input.readMessage(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.PARSER, extensionRegistry));
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          if (((mutable_bitField0_ & 0x00000004) != 0)) {
-            content_ = java.util.Collections.unmodifiableList(content_);
-          }
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_descriptor;
@@ -2852,6 +2693,7 @@ private Bucket(
        * required .Address owner = 1;
        * @return Whether the owner field is set.
        */
+      @java.lang.Override
       public boolean hasOwner() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -2859,22 +2701,25 @@ public boolean hasOwner() {
        * required .Address owner = 1;
        * @return The owner.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getOwner() {
         return owner_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance() : owner_;
       }
       /**
        * required .Address owner = 1;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getOwnerOrBuilder() {
         return owner_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance() : owner_;
       }
 
       public static final int VERSION_FIELD_NUMBER = 2;
-      private long version_;
+      private long version_ = 0L;
       /**
        * required int64 version = 2;
        * @return Whether the version field is set.
        */
+      @java.lang.Override
       public boolean hasVersion() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -2882,21 +2727,25 @@ public boolean hasVersion() {
        * required int64 version = 2;
        * @return The version.
        */
+      @java.lang.Override
       public long getVersion() {
         return version_;
       }
 
       public static final int CONTENT_FIELD_NUMBER = 3;
+      @SuppressWarnings("serial")
       private java.util.List content_;
       /**
        * repeated .Delta.Entry content = 3;
        */
+      @java.lang.Override
       public java.util.List getContentList() {
         return content_;
       }
       /**
        * repeated .Delta.Entry content = 3;
        */
+      @java.lang.Override
       public java.util.List 
           getContentOrBuilderList() {
         return content_;
@@ -2904,18 +2753,21 @@ public java.util.Listrepeated .Delta.Entry content = 3;
        */
+      @java.lang.Override
       public int getContentCount() {
         return content_.size();
       }
       /**
        * repeated .Delta.Entry content = 3;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry getContent(int index) {
         return content_.get(index);
       }
       /**
        * repeated .Delta.Entry content = 3;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder getContentOrBuilder(
           int index) {
         return content_.get(index);
@@ -2962,7 +2814,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         for (int i = 0; i < content_.size(); i++) {
           output.writeMessage(3, content_.get(i));
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -2983,7 +2835,7 @@ public int getSerializedSize() {
           size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(3, content_.get(i));
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -3010,7 +2862,7 @@ public boolean equals(final java.lang.Object obj) {
         }
         if (!getContentList()
             .equals(other.getContentList())) return false;
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -3034,7 +2886,7 @@ public int hashCode() {
           hash = (37 * hash) + CONTENT_FIELD_NUMBER;
           hash = (53 * hash) + getContentList().hashCode();
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -3083,11 +2935,13 @@ public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMess
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
+
       public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
+
       public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseDelimitedFrom(
           java.io.InputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -3169,20 +3023,20 @@ private void maybeForceBuilderInitialization() {
         @java.lang.Override
         public Builder clear() {
           super.clear();
-          if (ownerBuilder_ == null) {
-            owner_ = null;
-          } else {
-            ownerBuilder_.clear();
+          bitField0_ = 0;
+          owner_ = null;
+          if (ownerBuilder_ != null) {
+            ownerBuilder_.dispose();
+            ownerBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000001);
           version_ = 0L;
-          bitField0_ = (bitField0_ & ~0x00000002);
           if (contentBuilder_ == null) {
             content_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
+            content_ = null;
             contentBuilder_.clear();
           }
+          bitField0_ = (bitField0_ & ~0x00000004);
           return this;
         }
 
@@ -3209,20 +3063,13 @@ public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.De
         @java.lang.Override
         public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket buildPartial() {
           org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket(this);
-          int from_bitField0_ = bitField0_;
-          int to_bitField0_ = 0;
-          if (((from_bitField0_ & 0x00000001) != 0)) {
-            if (ownerBuilder_ == null) {
-              result.owner_ = owner_;
-            } else {
-              result.owner_ = ownerBuilder_.build();
-            }
-            to_bitField0_ |= 0x00000001;
-          }
-          if (((from_bitField0_ & 0x00000002) != 0)) {
-            result.version_ = version_;
-            to_bitField0_ |= 0x00000002;
-          }
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket result) {
           if (contentBuilder_ == null) {
             if (((bitField0_ & 0x00000004) != 0)) {
               content_ = java.util.Collections.unmodifiableList(content_);
@@ -3232,9 +3079,22 @@ public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.De
           } else {
             result.content_ = contentBuilder_.build();
           }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+        }
+
+        private void buildPartial0(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket result) {
+          int from_bitField0_ = bitField0_;
+          int to_bitField0_ = 0;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.owner_ = ownerBuilder_ == null
+                ? owner_
+                : ownerBuilder_.build();
+            to_bitField0_ |= 0x00000001;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.version_ = version_;
+            to_bitField0_ |= 0x00000002;
+          }
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -3313,7 +3173,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.Distribute
               }
             }
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -3342,17 +3202,55 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 10: {
+                  input.readMessage(
+                      getOwnerFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+                case 16: {
+                  version_ = input.readInt64();
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 16
+                case 26: {
+                  org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry m =
+                      input.readMessage(
+                          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.PARSER,
+                          extensionRegistry);
+                  if (contentBuilder_ == null) {
+                    ensureContentIsMutable();
+                    content_.add(m);
+                  } else {
+                    contentBuilder_.addMessage(m);
+                  }
+                  break;
+                } // case 26
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
         private int bitField0_;
@@ -3387,11 +3285,11 @@ public Builder setOwner(org.apache.pekko.cluster.pubsub.protobuf.msg.Distributed
               throw new NullPointerException();
             }
             owner_ = value;
-            onChanged();
           } else {
             ownerBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000001;
+          onChanged();
           return this;
         }
         /**
@@ -3401,11 +3299,11 @@ public Builder setOwner(
             org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder builderForValue) {
           if (ownerBuilder_ == null) {
             owner_ = builderForValue.build();
-            onChanged();
           } else {
             ownerBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000001;
+          onChanged();
           return this;
         }
         /**
@@ -3414,31 +3312,32 @@ public Builder setOwner(
         public Builder mergeOwner(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address value) {
           if (ownerBuilder_ == null) {
             if (((bitField0_ & 0x00000001) != 0) &&
-                owner_ != null &&
-                owner_ != org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance()) {
-              owner_ =
-                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.newBuilder(owner_).mergeFrom(value).buildPartial();
+              owner_ != null &&
+              owner_ != org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance()) {
+              getOwnerBuilder().mergeFrom(value);
             } else {
               owner_ = value;
             }
-            onChanged();
           } else {
             ownerBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000001;
+          if (owner_ != null) {
+            bitField0_ |= 0x00000001;
+            onChanged();
+          }
           return this;
         }
         /**
          * required .Address owner = 1;
          */
         public Builder clearOwner() {
-          if (ownerBuilder_ == null) {
-            owner_ = null;
-            onChanged();
-          } else {
-            ownerBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000001);
+          owner_ = null;
+          if (ownerBuilder_ != null) {
+            ownerBuilder_.dispose();
+            ownerBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -3482,6 +3381,7 @@ public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Ad
          * required int64 version = 2;
          * @return Whether the version field is set.
          */
+        @java.lang.Override
         public boolean hasVersion() {
           return ((bitField0_ & 0x00000002) != 0);
         }
@@ -3489,6 +3389,7 @@ public boolean hasVersion() {
          * required int64 version = 2;
          * @return The version.
          */
+        @java.lang.Override
         public long getVersion() {
           return version_;
         }
@@ -3498,8 +3399,9 @@ public long getVersion() {
          * @return This builder for chaining.
          */
         public Builder setVersion(long value) {
-          bitField0_ |= 0x00000002;
+
           version_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -3786,7 +3688,18 @@ public Bucket parsePartialFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-          return new Bucket(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
@@ -3807,16 +3720,19 @@ public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.De
     }
 
     public static final int BUCKETS_FIELD_NUMBER = 1;
+    @SuppressWarnings("serial")
     private java.util.List buckets_;
     /**
      * repeated .Delta.Bucket buckets = 1;
      */
+    @java.lang.Override
     public java.util.List getBucketsList() {
       return buckets_;
     }
     /**
      * repeated .Delta.Bucket buckets = 1;
      */
+    @java.lang.Override
     public java.util.List 
         getBucketsOrBuilderList() {
       return buckets_;
@@ -3824,18 +3740,21 @@ public java.util.Listrepeated .Delta.Bucket buckets = 1;
      */
+    @java.lang.Override
     public int getBucketsCount() {
       return buckets_.size();
     }
     /**
      * repeated .Delta.Bucket buckets = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getBuckets(int index) {
       return buckets_.get(index);
     }
     /**
      * repeated .Delta.Bucket buckets = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder getBucketsOrBuilder(
         int index) {
       return buckets_.get(index);
@@ -3864,7 +3783,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < buckets_.size(); i++) {
         output.writeMessage(1, buckets_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -3877,7 +3796,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, buckets_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -3894,7 +3813,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getBucketsList()
           .equals(other.getBucketsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -3909,7 +3828,7 @@ public int hashCode() {
         hash = (37 * hash) + BUCKETS_FIELD_NUMBER;
         hash = (53 * hash) + getBucketsList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3958,11 +3877,13 @@ public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -4026,29 +3947,25 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getBucketsFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (bucketsBuilder_ == null) {
           buckets_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
+          buckets_ = null;
           bucketsBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -4075,7 +3992,13 @@ public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.De
       @java.lang.Override
       public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta buildPartial() {
         org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta(this);
-        int from_bitField0_ = bitField0_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta result) {
         if (bucketsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             buckets_ = java.util.Collections.unmodifiableList(buckets_);
@@ -4085,8 +4008,10 @@ public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.De
         } else {
           result.buckets_ = bucketsBuilder_.build();
         }
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta result) {
+        int from_bitField0_ = bitField0_;
       }
 
       @java.lang.Override
@@ -4159,7 +4084,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.Distribute
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -4179,17 +4104,43 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.PARSER,
+                        extensionRegistry);
+                if (bucketsBuilder_ == null) {
+                  ensureBucketsIsMutable();
+                  buckets_.add(m);
+                } else {
+                  bucketsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -4466,7 +4417,18 @@ public Delta parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Delta(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -4560,7 +4522,7 @@ public interface AddressOrBuilder extends
    *
    * Protobuf type {@code Address}
    */
-  public  static final class Address extends
+  public static final class Address extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Address)
       AddressOrBuilder {
@@ -4582,72 +4544,6 @@ protected java.lang.Object newInstance(
       return new Address();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Address(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              system_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              hostname_ = bs;
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              port_ = input.readUInt32();
-              break;
-            }
-            case 34: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000008;
-              protocol_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Address_descriptor;
@@ -4663,11 +4559,13 @@ private Address(
 
     private int bitField0_;
     public static final int SYSTEM_FIELD_NUMBER = 1;
-    private volatile java.lang.Object system_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object system_ = "";
     /**
      * required string system = 1;
      * @return Whether the system field is set.
      */
+    @java.lang.Override
     public boolean hasSystem() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -4675,6 +4573,7 @@ public boolean hasSystem() {
      * required string system = 1;
      * @return The system.
      */
+    @java.lang.Override
     public java.lang.String getSystem() {
       java.lang.Object ref = system_;
       if (ref instanceof java.lang.String) {
@@ -4693,6 +4592,7 @@ public java.lang.String getSystem() {
      * required string system = 1;
      * @return The bytes for system.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getSystemBytes() {
       java.lang.Object ref = system_;
@@ -4708,11 +4608,13 @@ public java.lang.String getSystem() {
     }
 
     public static final int HOSTNAME_FIELD_NUMBER = 2;
-    private volatile java.lang.Object hostname_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object hostname_ = "";
     /**
      * required string hostname = 2;
      * @return Whether the hostname field is set.
      */
+    @java.lang.Override
     public boolean hasHostname() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -4720,6 +4622,7 @@ public boolean hasHostname() {
      * required string hostname = 2;
      * @return The hostname.
      */
+    @java.lang.Override
     public java.lang.String getHostname() {
       java.lang.Object ref = hostname_;
       if (ref instanceof java.lang.String) {
@@ -4738,6 +4641,7 @@ public java.lang.String getHostname() {
      * required string hostname = 2;
      * @return The bytes for hostname.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getHostnameBytes() {
       java.lang.Object ref = hostname_;
@@ -4753,11 +4657,12 @@ public java.lang.String getHostname() {
     }
 
     public static final int PORT_FIELD_NUMBER = 3;
-    private int port_;
+    private int port_ = 0;
     /**
      * required uint32 port = 3;
      * @return Whether the port field is set.
      */
+    @java.lang.Override
     public boolean hasPort() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -4765,16 +4670,19 @@ public boolean hasPort() {
      * required uint32 port = 3;
      * @return The port.
      */
+    @java.lang.Override
     public int getPort() {
       return port_;
     }
 
     public static final int PROTOCOL_FIELD_NUMBER = 4;
-    private volatile java.lang.Object protocol_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object protocol_ = "";
     /**
      * optional string protocol = 4;
      * @return Whether the protocol field is set.
      */
+    @java.lang.Override
     public boolean hasProtocol() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -4782,6 +4690,7 @@ public boolean hasProtocol() {
      * optional string protocol = 4;
      * @return The protocol.
      */
+    @java.lang.Override
     public java.lang.String getProtocol() {
       java.lang.Object ref = protocol_;
       if (ref instanceof java.lang.String) {
@@ -4800,6 +4709,7 @@ public java.lang.String getProtocol() {
      * optional string protocol = 4;
      * @return The bytes for protocol.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getProtocolBytes() {
       java.lang.Object ref = protocol_;
@@ -4852,7 +4762,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000008) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, protocol_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -4874,7 +4784,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000008) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(4, protocol_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4909,7 +4819,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getProtocol()
             .equals(other.getProtocol())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -4936,7 +4846,7 @@ public int hashCode() {
         hash = (37 * hash) + PROTOCOL_FIELD_NUMBER;
         hash = (53 * hash) + getProtocol().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4985,11 +4895,13 @@ public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -5058,30 +4970,22 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
-          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         system_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         hostname_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         port_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000004);
         protocol_ = "";
-        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -5108,27 +5012,31 @@ public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Ad
       @java.lang.Override
       public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address buildPartial() {
         org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.system_ = system_;
           to_bitField0_ |= 0x00000001;
         }
-        result.system_ = system_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.hostname_ = hostname_;
           to_bitField0_ |= 0x00000002;
         }
-        result.hostname_ = hostname_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.port_ = port_;
           to_bitField0_ |= 0x00000004;
         }
         if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.protocol_ = protocol_;
           to_bitField0_ |= 0x00000008;
         }
-        result.protocol_ = protocol_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -5176,24 +5084,24 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address other) {
         if (other == org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance()) return this;
         if (other.hasSystem()) {
-          bitField0_ |= 0x00000001;
           system_ = other.system_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasHostname()) {
-          bitField0_ |= 0x00000002;
           hostname_ = other.hostname_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasPort()) {
           setPort(other.getPort());
         }
         if (other.hasProtocol()) {
-          bitField0_ |= 0x00000008;
           protocol_ = other.protocol_;
+          bitField0_ |= 0x00000008;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -5217,17 +5125,50 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                system_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                hostname_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 24: {
+                port_ = input.readUInt32();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 34: {
+                protocol_ = input.readBytes();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 34
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -5282,11 +5223,9 @@ public java.lang.String getSystem() {
        */
       public Builder setSystem(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         system_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -5295,8 +5234,8 @@ public Builder setSystem(
        * @return This builder for chaining.
        */
       public Builder clearSystem() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         system_ = getDefaultInstance().getSystem();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -5307,11 +5246,9 @@ public Builder clearSystem() {
        */
       public Builder setSystemBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         system_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -5366,11 +5303,9 @@ public java.lang.String getHostname() {
        */
       public Builder setHostname(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         hostname_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -5379,8 +5314,8 @@ public Builder setHostname(
        * @return This builder for chaining.
        */
       public Builder clearHostname() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         hostname_ = getDefaultInstance().getHostname();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -5391,11 +5326,9 @@ public Builder clearHostname() {
        */
       public Builder setHostnameBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         hostname_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -5405,6 +5338,7 @@ public Builder setHostnameBytes(
        * required uint32 port = 3;
        * @return Whether the port field is set.
        */
+      @java.lang.Override
       public boolean hasPort() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -5412,6 +5346,7 @@ public boolean hasPort() {
        * required uint32 port = 3;
        * @return The port.
        */
+      @java.lang.Override
       public int getPort() {
         return port_;
       }
@@ -5421,8 +5356,9 @@ public int getPort() {
        * @return This builder for chaining.
        */
       public Builder setPort(int value) {
-        bitField0_ |= 0x00000004;
+
         port_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -5487,11 +5423,9 @@ public java.lang.String getProtocol() {
        */
       public Builder setProtocol(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
+        if (value == null) { throw new NullPointerException(); }
         protocol_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -5500,8 +5434,8 @@ public Builder setProtocol(
        * @return This builder for chaining.
        */
       public Builder clearProtocol() {
-        bitField0_ = (bitField0_ & ~0x00000008);
         protocol_ = getDefaultInstance().getProtocol();
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
@@ -5512,11 +5446,9 @@ public Builder clearProtocol() {
        */
       public Builder setProtocolBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
+        if (value == null) { throw new NullPointerException(); }
         protocol_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -5553,7 +5485,18 @@ public Address parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Address(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -5628,7 +5571,7 @@ public interface SendOrBuilder extends
    *
    * Protobuf type {@code Send}
    */
-  public  static final class Send extends
+  public static final class Send extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Send)
       SendOrBuilder {
@@ -5648,73 +5591,6 @@ protected java.lang.Object newInstance(
       return new Send();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Send(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              path_ = bs;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              localAffinity_ = input.readBool();
-              break;
-            }
-            case 26: {
-              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000004) != 0)) {
-                subBuilder = payload_.toBuilder();
-              }
-              payload_ = input.readMessage(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(payload_);
-                payload_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000004;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Send_descriptor;
@@ -5730,11 +5606,13 @@ private Send(
 
     private int bitField0_;
     public static final int PATH_FIELD_NUMBER = 1;
-    private volatile java.lang.Object path_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object path_ = "";
     /**
      * required string path = 1;
      * @return Whether the path field is set.
      */
+    @java.lang.Override
     public boolean hasPath() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -5742,6 +5620,7 @@ public boolean hasPath() {
      * required string path = 1;
      * @return The path.
      */
+    @java.lang.Override
     public java.lang.String getPath() {
       java.lang.Object ref = path_;
       if (ref instanceof java.lang.String) {
@@ -5760,6 +5639,7 @@ public java.lang.String getPath() {
      * required string path = 1;
      * @return The bytes for path.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getPathBytes() {
       java.lang.Object ref = path_;
@@ -5775,11 +5655,12 @@ public java.lang.String getPath() {
     }
 
     public static final int LOCALAFFINITY_FIELD_NUMBER = 2;
-    private boolean localAffinity_;
+    private boolean localAffinity_ = false;
     /**
      * required bool localAffinity = 2;
      * @return Whether the localAffinity field is set.
      */
+    @java.lang.Override
     public boolean hasLocalAffinity() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -5787,6 +5668,7 @@ public boolean hasLocalAffinity() {
      * required bool localAffinity = 2;
      * @return The localAffinity.
      */
+    @java.lang.Override
     public boolean getLocalAffinity() {
       return localAffinity_;
     }
@@ -5797,6 +5679,7 @@ public boolean getLocalAffinity() {
      * required .Payload payload = 3;
      * @return Whether the payload field is set.
      */
+    @java.lang.Override
     public boolean hasPayload() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -5804,12 +5687,14 @@ public boolean hasPayload() {
      * required .Payload payload = 3;
      * @return The payload.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() {
       return payload_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
     }
     /**
      * required .Payload payload = 3;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() {
       return payload_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
     }
@@ -5853,7 +5738,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeMessage(3, getPayload());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -5873,7 +5758,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, getPayload());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5903,7 +5788,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getPayload()
             .equals(other.getPayload())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -5927,7 +5812,7 @@ public int hashCode() {
         hash = (37 * hash) + PAYLOAD_FIELD_NUMBER;
         hash = (53 * hash) + getPayload().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -5976,11 +5861,13 @@ public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -6066,16 +5953,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         path_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         localAffinity_ = false;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        if (payloadBuilder_ == null) {
-          payload_ = null;
-        } else {
-          payloadBuilder_.clear();
+        payload_ = null;
+        if (payloadBuilder_ != null) {
+          payloadBuilder_.dispose();
+          payloadBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -6102,27 +5987,29 @@ public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Se
       @java.lang.Override
       public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send buildPartial() {
         org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.path_ = path_;
           to_bitField0_ |= 0x00000001;
         }
-        result.path_ = path_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.localAffinity_ = localAffinity_;
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
-          if (payloadBuilder_ == null) {
-            result.payload_ = payload_;
-          } else {
-            result.payload_ = payloadBuilder_.build();
-          }
+          result.payload_ = payloadBuilder_ == null
+              ? payload_
+              : payloadBuilder_.build();
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -6170,8 +6057,8 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send other) {
         if (other == org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.getDefaultInstance()) return this;
         if (other.hasPath()) {
-          bitField0_ |= 0x00000001;
           path_ = other.path_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasLocalAffinity()) {
@@ -6180,7 +6067,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.Distribute
         if (other.hasPayload()) {
           mergePayload(other.getPayload());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -6207,17 +6094,47 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                path_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                localAffinity_ = input.readBool();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 26: {
+                input.readMessage(
+                    getPayloadFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -6272,11 +6189,9 @@ public java.lang.String getPath() {
        */
       public Builder setPath(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         path_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -6285,8 +6200,8 @@ public Builder setPath(
        * @return This builder for chaining.
        */
       public Builder clearPath() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         path_ = getDefaultInstance().getPath();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -6297,11 +6212,9 @@ public Builder clearPath() {
        */
       public Builder setPathBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         path_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -6311,6 +6224,7 @@ public Builder setPathBytes(
        * required bool localAffinity = 2;
        * @return Whether the localAffinity field is set.
        */
+      @java.lang.Override
       public boolean hasLocalAffinity() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -6318,6 +6232,7 @@ public boolean hasLocalAffinity() {
        * required bool localAffinity = 2;
        * @return The localAffinity.
        */
+      @java.lang.Override
       public boolean getLocalAffinity() {
         return localAffinity_;
       }
@@ -6327,8 +6242,9 @@ public boolean getLocalAffinity() {
        * @return This builder for chaining.
        */
       public Builder setLocalAffinity(boolean value) {
-        bitField0_ |= 0x00000002;
+
         localAffinity_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -6373,11 +6289,11 @@ public Builder setPayload(org.apache.pekko.cluster.pubsub.protobuf.msg.Distribut
             throw new NullPointerException();
           }
           payload_ = value;
-          onChanged();
         } else {
           payloadBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -6387,11 +6303,11 @@ public Builder setPayload(
           org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder builderForValue) {
         if (payloadBuilder_ == null) {
           payload_ = builderForValue.build();
-          onChanged();
         } else {
           payloadBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -6400,31 +6316,32 @@ public Builder setPayload(
       public Builder mergePayload(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) {
         if (payloadBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
-              payload_ != null &&
-              payload_ != org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) {
-            payload_ =
-              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder(payload_).mergeFrom(value).buildPartial();
+            payload_ != null &&
+            payload_ != org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) {
+            getPayloadBuilder().mergeFrom(value);
           } else {
             payload_ = value;
           }
-          onChanged();
         } else {
           payloadBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000004;
+        if (payload_ != null) {
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Payload payload = 3;
        */
       public Builder clearPayload() {
-        if (payloadBuilder_ == null) {
-          payload_ = null;
-          onChanged();
-        } else {
-          payloadBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000004);
+        payload_ = null;
+        if (payloadBuilder_ != null) {
+          payloadBuilder_.dispose();
+          payloadBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -6495,7 +6412,18 @@ public Send parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Send(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -6570,7 +6498,7 @@ public interface SendToAllOrBuilder extends
    *
    * Protobuf type {@code SendToAll}
    */
-  public  static final class SendToAll extends
+  public static final class SendToAll extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:SendToAll)
       SendToAllOrBuilder {
@@ -6590,73 +6518,6 @@ protected java.lang.Object newInstance(
       return new SendToAll();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private SendToAll(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              path_ = bs;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              allButSelf_ = input.readBool();
-              break;
-            }
-            case 26: {
-              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000004) != 0)) {
-                subBuilder = payload_.toBuilder();
-              }
-              payload_ = input.readMessage(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(payload_);
-                payload_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000004;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_descriptor;
@@ -6672,11 +6533,13 @@ private SendToAll(
 
     private int bitField0_;
     public static final int PATH_FIELD_NUMBER = 1;
-    private volatile java.lang.Object path_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object path_ = "";
     /**
      * required string path = 1;
      * @return Whether the path field is set.
      */
+    @java.lang.Override
     public boolean hasPath() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -6684,6 +6547,7 @@ public boolean hasPath() {
      * required string path = 1;
      * @return The path.
      */
+    @java.lang.Override
     public java.lang.String getPath() {
       java.lang.Object ref = path_;
       if (ref instanceof java.lang.String) {
@@ -6702,6 +6566,7 @@ public java.lang.String getPath() {
      * required string path = 1;
      * @return The bytes for path.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getPathBytes() {
       java.lang.Object ref = path_;
@@ -6717,11 +6582,12 @@ public java.lang.String getPath() {
     }
 
     public static final int ALLBUTSELF_FIELD_NUMBER = 2;
-    private boolean allButSelf_;
+    private boolean allButSelf_ = false;
     /**
      * required bool allButSelf = 2;
      * @return Whether the allButSelf field is set.
      */
+    @java.lang.Override
     public boolean hasAllButSelf() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -6729,6 +6595,7 @@ public boolean hasAllButSelf() {
      * required bool allButSelf = 2;
      * @return The allButSelf.
      */
+    @java.lang.Override
     public boolean getAllButSelf() {
       return allButSelf_;
     }
@@ -6739,6 +6606,7 @@ public boolean getAllButSelf() {
      * required .Payload payload = 3;
      * @return Whether the payload field is set.
      */
+    @java.lang.Override
     public boolean hasPayload() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -6746,12 +6614,14 @@ public boolean hasPayload() {
      * required .Payload payload = 3;
      * @return The payload.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() {
       return payload_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
     }
     /**
      * required .Payload payload = 3;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() {
       return payload_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
     }
@@ -6795,7 +6665,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeMessage(3, getPayload());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -6815,7 +6685,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, getPayload());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -6845,7 +6715,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getPayload()
             .equals(other.getPayload())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -6869,7 +6739,7 @@ public int hashCode() {
         hash = (37 * hash) + PAYLOAD_FIELD_NUMBER;
         hash = (53 * hash) + getPayload().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -6918,11 +6788,13 @@ public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -7008,16 +6880,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         path_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         allButSelf_ = false;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        if (payloadBuilder_ == null) {
-          payload_ = null;
-        } else {
-          payloadBuilder_.clear();
+        payload_ = null;
+        if (payloadBuilder_ != null) {
+          payloadBuilder_.dispose();
+          payloadBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -7044,27 +6914,29 @@ public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Se
       @java.lang.Override
       public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll buildPartial() {
         org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.path_ = path_;
           to_bitField0_ |= 0x00000001;
         }
-        result.path_ = path_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.allButSelf_ = allButSelf_;
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
-          if (payloadBuilder_ == null) {
-            result.payload_ = payload_;
-          } else {
-            result.payload_ = payloadBuilder_.build();
-          }
+          result.payload_ = payloadBuilder_ == null
+              ? payload_
+              : payloadBuilder_.build();
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -7112,8 +6984,8 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll other) {
         if (other == org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.getDefaultInstance()) return this;
         if (other.hasPath()) {
-          bitField0_ |= 0x00000001;
           path_ = other.path_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasAllButSelf()) {
@@ -7122,7 +6994,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.Distribute
         if (other.hasPayload()) {
           mergePayload(other.getPayload());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -7149,17 +7021,47 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                path_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                allButSelf_ = input.readBool();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 26: {
+                input.readMessage(
+                    getPayloadFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -7214,11 +7116,9 @@ public java.lang.String getPath() {
        */
       public Builder setPath(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         path_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -7227,8 +7127,8 @@ public Builder setPath(
        * @return This builder for chaining.
        */
       public Builder clearPath() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         path_ = getDefaultInstance().getPath();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -7239,11 +7139,9 @@ public Builder clearPath() {
        */
       public Builder setPathBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         path_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -7253,6 +7151,7 @@ public Builder setPathBytes(
        * required bool allButSelf = 2;
        * @return Whether the allButSelf field is set.
        */
+      @java.lang.Override
       public boolean hasAllButSelf() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -7260,6 +7159,7 @@ public boolean hasAllButSelf() {
        * required bool allButSelf = 2;
        * @return The allButSelf.
        */
+      @java.lang.Override
       public boolean getAllButSelf() {
         return allButSelf_;
       }
@@ -7269,8 +7169,9 @@ public boolean getAllButSelf() {
        * @return This builder for chaining.
        */
       public Builder setAllButSelf(boolean value) {
-        bitField0_ |= 0x00000002;
+
         allButSelf_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -7315,11 +7216,11 @@ public Builder setPayload(org.apache.pekko.cluster.pubsub.protobuf.msg.Distribut
             throw new NullPointerException();
           }
           payload_ = value;
-          onChanged();
         } else {
           payloadBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -7329,11 +7230,11 @@ public Builder setPayload(
           org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder builderForValue) {
         if (payloadBuilder_ == null) {
           payload_ = builderForValue.build();
-          onChanged();
         } else {
           payloadBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -7342,31 +7243,32 @@ public Builder setPayload(
       public Builder mergePayload(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) {
         if (payloadBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
-              payload_ != null &&
-              payload_ != org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) {
-            payload_ =
-              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder(payload_).mergeFrom(value).buildPartial();
+            payload_ != null &&
+            payload_ != org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) {
+            getPayloadBuilder().mergeFrom(value);
           } else {
             payload_ = value;
           }
-          onChanged();
         } else {
           payloadBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000004;
+        if (payload_ != null) {
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Payload payload = 3;
        */
       public Builder clearPayload() {
-        if (payloadBuilder_ == null) {
-          payload_ = null;
-          onChanged();
-        } else {
-          payloadBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000004);
+        payload_ = null;
+        if (payloadBuilder_ != null) {
+          payloadBuilder_.dispose();
+          payloadBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -7437,7 +7339,18 @@ public SendToAll parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new SendToAll(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -7501,7 +7414,7 @@ public interface PublishOrBuilder extends
    *
    * Protobuf type {@code Publish}
    */
-  public  static final class Publish extends
+  public static final class Publish extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Publish)
       PublishOrBuilder {
@@ -7521,68 +7434,6 @@ protected java.lang.Object newInstance(
       return new Publish();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Publish(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              topic_ = bs;
-              break;
-            }
-            case 26: {
-              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = payload_.toBuilder();
-              }
-              payload_ = input.readMessage(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(payload_);
-                payload_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_descriptor;
@@ -7598,11 +7449,13 @@ private Publish(
 
     private int bitField0_;
     public static final int TOPIC_FIELD_NUMBER = 1;
-    private volatile java.lang.Object topic_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object topic_ = "";
     /**
      * required string topic = 1;
      * @return Whether the topic field is set.
      */
+    @java.lang.Override
     public boolean hasTopic() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -7610,6 +7463,7 @@ public boolean hasTopic() {
      * required string topic = 1;
      * @return The topic.
      */
+    @java.lang.Override
     public java.lang.String getTopic() {
       java.lang.Object ref = topic_;
       if (ref instanceof java.lang.String) {
@@ -7628,6 +7482,7 @@ public java.lang.String getTopic() {
      * required string topic = 1;
      * @return The bytes for topic.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getTopicBytes() {
       java.lang.Object ref = topic_;
@@ -7648,6 +7503,7 @@ public java.lang.String getTopic() {
      * required .Payload payload = 3;
      * @return Whether the payload field is set.
      */
+    @java.lang.Override
     public boolean hasPayload() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -7655,12 +7511,14 @@ public boolean hasPayload() {
      * required .Payload payload = 3;
      * @return The payload.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() {
       return payload_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
     }
     /**
      * required .Payload payload = 3;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() {
       return payload_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
     }
@@ -7697,7 +7555,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(3, getPayload());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -7713,7 +7571,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, getPayload());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -7738,7 +7596,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getPayload()
             .equals(other.getPayload())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -7757,7 +7615,7 @@ public int hashCode() {
         hash = (37 * hash) + PAYLOAD_FIELD_NUMBER;
         hash = (53 * hash) + getPayload().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -7806,11 +7664,13 @@ public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -7896,14 +7756,13 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         topic_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (payloadBuilder_ == null) {
-          payload_ = null;
-        } else {
-          payloadBuilder_.clear();
+        payload_ = null;
+        if (payloadBuilder_ != null) {
+          payloadBuilder_.dispose();
+          payloadBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -7930,23 +7789,25 @@ public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Pu
       @java.lang.Override
       public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish buildPartial() {
         org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.topic_ = topic_;
           to_bitField0_ |= 0x00000001;
         }
-        result.topic_ = topic_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (payloadBuilder_ == null) {
-            result.payload_ = payload_;
-          } else {
-            result.payload_ = payloadBuilder_.build();
-          }
+          result.payload_ = payloadBuilder_ == null
+              ? payload_
+              : payloadBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -7994,14 +7855,14 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish other) {
         if (other == org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.getDefaultInstance()) return this;
         if (other.hasTopic()) {
-          bitField0_ |= 0x00000001;
           topic_ = other.topic_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasPayload()) {
           mergePayload(other.getPayload());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -8025,17 +7886,42 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                topic_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 26: {
+                input.readMessage(
+                    getPayloadFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -8090,11 +7976,9 @@ public java.lang.String getTopic() {
        */
       public Builder setTopic(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         topic_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8103,8 +7987,8 @@ public Builder setTopic(
        * @return This builder for chaining.
        */
       public Builder clearTopic() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         topic_ = getDefaultInstance().getTopic();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -8115,11 +7999,9 @@ public Builder clearTopic() {
        */
       public Builder setTopicBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         topic_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8154,11 +8036,11 @@ public Builder setPayload(org.apache.pekko.cluster.pubsub.protobuf.msg.Distribut
             throw new NullPointerException();
           }
           payload_ = value;
-          onChanged();
         } else {
           payloadBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -8168,11 +8050,11 @@ public Builder setPayload(
           org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder builderForValue) {
         if (payloadBuilder_ == null) {
           payload_ = builderForValue.build();
-          onChanged();
         } else {
           payloadBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -8181,31 +8063,32 @@ public Builder setPayload(
       public Builder mergePayload(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) {
         if (payloadBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              payload_ != null &&
-              payload_ != org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) {
-            payload_ =
-              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder(payload_).mergeFrom(value).buildPartial();
+            payload_ != null &&
+            payload_ != org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) {
+            getPayloadBuilder().mergeFrom(value);
           } else {
             payload_ = value;
           }
-          onChanged();
         } else {
           payloadBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (payload_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Payload payload = 3;
        */
       public Builder clearPayload() {
-        if (payloadBuilder_ == null) {
-          payload_ = null;
-          onChanged();
-        } else {
-          payloadBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        payload_ = null;
+        if (payloadBuilder_ != null) {
+          payloadBuilder_.dispose();
+          payloadBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -8276,7 +8159,18 @@ public Publish parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Publish(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -8323,7 +8217,7 @@ public interface SendToOneSubscriberOrBuilder extends
    *
    * Protobuf type {@code SendToOneSubscriber}
    */
-  public  static final class SendToOneSubscriber extends
+  public static final class SendToOneSubscriber extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:SendToOneSubscriber)
       SendToOneSubscriberOrBuilder {
@@ -8342,62 +8236,6 @@ protected java.lang.Object newInstance(
       return new SendToOneSubscriber();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private SendToOneSubscriber(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = payload_.toBuilder();
-              }
-              payload_ = input.readMessage(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(payload_);
-                payload_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToOneSubscriber_descriptor;
@@ -8418,6 +8256,7 @@ private SendToOneSubscriber(
      * required .Payload payload = 1;
      * @return Whether the payload field is set.
      */
+    @java.lang.Override
     public boolean hasPayload() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -8425,12 +8264,14 @@ public boolean hasPayload() {
      * required .Payload payload = 1;
      * @return The payload.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() {
       return payload_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
     }
     /**
      * required .Payload payload = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() {
       return payload_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
     }
@@ -8460,7 +8301,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getPayload());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -8473,7 +8314,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getPayload());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -8493,7 +8334,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getPayload()
             .equals(other.getPayload())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -8508,7 +8349,7 @@ public int hashCode() {
         hash = (37 * hash) + PAYLOAD_FIELD_NUMBER;
         hash = (53 * hash) + getPayload().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -8557,11 +8398,13 @@ public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -8647,12 +8490,12 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (payloadBuilder_ == null) {
-          payload_ = null;
-        } else {
-          payloadBuilder_.clear();
+        bitField0_ = 0;
+        payload_ = null;
+        if (payloadBuilder_ != null) {
+          payloadBuilder_.dispose();
+          payloadBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -8679,19 +8522,21 @@ public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Se
       @java.lang.Override
       public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber buildPartial() {
         org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (payloadBuilder_ == null) {
-            result.payload_ = payload_;
-          } else {
-            result.payload_ = payloadBuilder_.build();
-          }
+          result.payload_ = payloadBuilder_ == null
+              ? payload_
+              : payloadBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -8741,7 +8586,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.Distribute
         if (other.hasPayload()) {
           mergePayload(other.getPayload());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -8762,17 +8607,37 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getPayloadFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -8807,11 +8672,11 @@ public Builder setPayload(org.apache.pekko.cluster.pubsub.protobuf.msg.Distribut
             throw new NullPointerException();
           }
           payload_ = value;
-          onChanged();
         } else {
           payloadBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -8821,11 +8686,11 @@ public Builder setPayload(
           org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder builderForValue) {
         if (payloadBuilder_ == null) {
           payload_ = builderForValue.build();
-          onChanged();
         } else {
           payloadBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -8834,31 +8699,32 @@ public Builder setPayload(
       public Builder mergePayload(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) {
         if (payloadBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              payload_ != null &&
-              payload_ != org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) {
-            payload_ =
-              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder(payload_).mergeFrom(value).buildPartial();
+            payload_ != null &&
+            payload_ != org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) {
+            getPayloadBuilder().mergeFrom(value);
           } else {
             payload_ = value;
           }
-          onChanged();
         } else {
           payloadBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (payload_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Payload payload = 1;
        */
       public Builder clearPayload() {
-        if (payloadBuilder_ == null) {
-          payload_ = null;
-          onChanged();
-        } else {
-          payloadBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        payload_ = null;
+        if (payloadBuilder_ != null) {
+          payloadBuilder_.dispose();
+          payloadBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -8929,7 +8795,18 @@ public SendToOneSubscriber parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new SendToOneSubscriber(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -8989,7 +8866,7 @@ public interface PayloadOrBuilder extends
   /**
    * Protobuf type {@code Payload}
    */
-  public  static final class Payload extends
+  public static final class Payload extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Payload)
       PayloadOrBuilder {
@@ -9010,64 +8887,6 @@ protected java.lang.Object newInstance(
       return new Payload();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Payload(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              bitField0_ |= 0x00000001;
-              enclosedMessage_ = input.readBytes();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              serializerId_ = input.readInt32();
-              break;
-            }
-            case 34: {
-              bitField0_ |= 0x00000004;
-              messageManifest_ = input.readBytes();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_descriptor;
@@ -9083,11 +8902,12 @@ private Payload(
 
     private int bitField0_;
     public static final int ENCLOSEDMESSAGE_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.ByteString enclosedMessage_;
+    private org.apache.pekko.protobufv3.internal.ByteString enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * required bytes enclosedMessage = 1;
      * @return Whether the enclosedMessage field is set.
      */
+    @java.lang.Override
     public boolean hasEnclosedMessage() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -9095,16 +8915,18 @@ public boolean hasEnclosedMessage() {
      * required bytes enclosedMessage = 1;
      * @return The enclosedMessage.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
       return enclosedMessage_;
     }
 
     public static final int SERIALIZERID_FIELD_NUMBER = 2;
-    private int serializerId_;
+    private int serializerId_ = 0;
     /**
      * required int32 serializerId = 2;
      * @return Whether the serializerId field is set.
      */
+    @java.lang.Override
     public boolean hasSerializerId() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -9112,16 +8934,18 @@ public boolean hasSerializerId() {
      * required int32 serializerId = 2;
      * @return The serializerId.
      */
+    @java.lang.Override
     public int getSerializerId() {
       return serializerId_;
     }
 
     public static final int MESSAGEMANIFEST_FIELD_NUMBER = 4;
-    private org.apache.pekko.protobufv3.internal.ByteString messageManifest_;
+    private org.apache.pekko.protobufv3.internal.ByteString messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * optional bytes messageManifest = 4;
      * @return Whether the messageManifest field is set.
      */
+    @java.lang.Override
     public boolean hasMessageManifest() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -9129,6 +8953,7 @@ public boolean hasMessageManifest() {
      * optional bytes messageManifest = 4;
      * @return The messageManifest.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
       return messageManifest_;
     }
@@ -9164,7 +8989,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeBytes(4, messageManifest_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -9185,7 +9010,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(4, messageManifest_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -9215,7 +9040,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getMessageManifest()
             .equals(other.getMessageManifest())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -9238,7 +9063,7 @@ public int hashCode() {
         hash = (37 * hash) + MESSAGEMANIFEST_FIELD_NUMBER;
         hash = (53 * hash) + getMessageManifest().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -9287,11 +9112,13 @@ public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMess
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -9355,28 +9182,21 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
         serializerId_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -9403,23 +9223,27 @@ public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Pa
       @java.lang.Override
       public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload buildPartial() {
         org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.enclosedMessage_ = enclosedMessage_;
           to_bitField0_ |= 0x00000001;
         }
-        result.enclosedMessage_ = enclosedMessage_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.serializerId_ = serializerId_;
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.messageManifest_ = messageManifest_;
           to_bitField0_ |= 0x00000004;
         }
-        result.messageManifest_ = messageManifest_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -9475,7 +9299,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.Distribute
         if (other.hasMessageManifest()) {
           setMessageManifest(other.getMessageManifest());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -9496,17 +9320,45 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                enclosedMessage_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                serializerId_ = input.readInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 34: {
+                messageManifest_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 34
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -9516,6 +9368,7 @@ public Builder mergeFrom(
        * required bytes enclosedMessage = 1;
        * @return Whether the enclosedMessage field is set.
        */
+      @java.lang.Override
       public boolean hasEnclosedMessage() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -9523,6 +9376,7 @@ public boolean hasEnclosedMessage() {
        * required bytes enclosedMessage = 1;
        * @return The enclosedMessage.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
         return enclosedMessage_;
       }
@@ -9532,11 +9386,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
        * @return This builder for chaining.
        */
       public Builder setEnclosedMessage(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         enclosedMessage_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -9556,6 +9408,7 @@ public Builder clearEnclosedMessage() {
        * required int32 serializerId = 2;
        * @return Whether the serializerId field is set.
        */
+      @java.lang.Override
       public boolean hasSerializerId() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -9563,6 +9416,7 @@ public boolean hasSerializerId() {
        * required int32 serializerId = 2;
        * @return The serializerId.
        */
+      @java.lang.Override
       public int getSerializerId() {
         return serializerId_;
       }
@@ -9572,8 +9426,9 @@ public int getSerializerId() {
        * @return This builder for chaining.
        */
       public Builder setSerializerId(int value) {
-        bitField0_ |= 0x00000002;
+
         serializerId_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -9593,6 +9448,7 @@ public Builder clearSerializerId() {
        * optional bytes messageManifest = 4;
        * @return Whether the messageManifest field is set.
        */
+      @java.lang.Override
       public boolean hasMessageManifest() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -9600,6 +9456,7 @@ public boolean hasMessageManifest() {
        * optional bytes messageManifest = 4;
        * @return The messageManifest.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
         return messageManifest_;
       }
@@ -9609,11 +9466,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
        * @return This builder for chaining.
        */
       public Builder setMessageManifest(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         messageManifest_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -9660,7 +9515,18 @@ public Payload parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Payload(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
diff --git a/cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ClusterMessages.java b/cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ClusterMessages.java
index 477ca04c1c9..190bf157d35 100644
--- a/cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ClusterMessages.java
+++ b/cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ClusterMessages.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2020-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ClusterMessages.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.cluster.typed.internal.protobuf;
 
 public final class ClusterMessages {
@@ -73,7 +74,7 @@ public interface ReceptionistEntryOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.typed.ReceptionistEntry}
    */
-  public  static final class ReceptionistEntry extends
+  public static final class ReceptionistEntry extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.ReceptionistEntry)
       ReceptionistEntryOrBuilder {
@@ -93,65 +94,6 @@ protected java.lang.Object newInstance(
       return new ReceptionistEntry();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ReceptionistEntry(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              actorRef_ = bs;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              systemUid_ = input.readUInt64();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              createdTimestamp_ = input.readInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_org_apache_pekko_cluster_typed_ReceptionistEntry_descriptor;
@@ -167,11 +109,13 @@ private ReceptionistEntry(
 
     private int bitField0_;
     public static final int ACTORREF_FIELD_NUMBER = 1;
-    private volatile java.lang.Object actorRef_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object actorRef_ = "";
     /**
      * required string actorRef = 1;
      * @return Whether the actorRef field is set.
      */
+    @java.lang.Override
     public boolean hasActorRef() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -179,6 +123,7 @@ public boolean hasActorRef() {
      * required string actorRef = 1;
      * @return The actorRef.
      */
+    @java.lang.Override
     public java.lang.String getActorRef() {
       java.lang.Object ref = actorRef_;
       if (ref instanceof java.lang.String) {
@@ -197,6 +142,7 @@ public java.lang.String getActorRef() {
      * required string actorRef = 1;
      * @return The bytes for actorRef.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getActorRefBytes() {
       java.lang.Object ref = actorRef_;
@@ -212,11 +158,12 @@ public java.lang.String getActorRef() {
     }
 
     public static final int SYSTEMUID_FIELD_NUMBER = 2;
-    private long systemUid_;
+    private long systemUid_ = 0L;
     /**
      * required uint64 systemUid = 2;
      * @return Whether the systemUid field is set.
      */
+    @java.lang.Override
     public boolean hasSystemUid() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -224,16 +171,18 @@ public boolean hasSystemUid() {
      * required uint64 systemUid = 2;
      * @return The systemUid.
      */
+    @java.lang.Override
     public long getSystemUid() {
       return systemUid_;
     }
 
     public static final int CREATEDTIMESTAMP_FIELD_NUMBER = 3;
-    private long createdTimestamp_;
+    private long createdTimestamp_ = 0L;
     /**
      * optional int64 createdTimestamp = 3;
      * @return Whether the createdTimestamp field is set.
      */
+    @java.lang.Override
     public boolean hasCreatedTimestamp() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -241,6 +190,7 @@ public boolean hasCreatedTimestamp() {
      * optional int64 createdTimestamp = 3;
      * @return The createdTimestamp.
      */
+    @java.lang.Override
     public long getCreatedTimestamp() {
       return createdTimestamp_;
     }
@@ -276,7 +226,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeInt64(3, createdTimestamp_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -296,7 +246,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(3, createdTimestamp_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -326,7 +276,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getCreatedTimestamp()
             != other.getCreatedTimestamp()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -351,7 +301,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getCreatedTimestamp());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -400,11 +350,13 @@ public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.R
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -468,28 +420,21 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         actorRef_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         systemUid_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
         createdTimestamp_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -516,12 +461,18 @@ public org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.Receptio
       @java.lang.Override
       public org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry buildPartial() {
         org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry result = new org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.actorRef_ = actorRef_;
           to_bitField0_ |= 0x00000001;
         }
-        result.actorRef_ = actorRef_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.systemUid_ = systemUid_;
           to_bitField0_ |= 0x00000002;
@@ -530,9 +481,7 @@ public org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.Receptio
           result.createdTimestamp_ = createdTimestamp_;
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -580,8 +529,8 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry other) {
         if (other == org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry.getDefaultInstance()) return this;
         if (other.hasActorRef()) {
-          bitField0_ |= 0x00000001;
           actorRef_ = other.actorRef_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasSystemUid()) {
@@ -590,7 +539,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.Cluste
         if (other.hasCreatedTimestamp()) {
           setCreatedTimestamp(other.getCreatedTimestamp());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -611,17 +560,45 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                actorRef_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                systemUid_ = input.readUInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                createdTimestamp_ = input.readInt64();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -676,11 +653,9 @@ public java.lang.String getActorRef() {
        */
       public Builder setActorRef(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         actorRef_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -689,8 +664,8 @@ public Builder setActorRef(
        * @return This builder for chaining.
        */
       public Builder clearActorRef() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         actorRef_ = getDefaultInstance().getActorRef();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -701,11 +676,9 @@ public Builder clearActorRef() {
        */
       public Builder setActorRefBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         actorRef_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -715,6 +688,7 @@ public Builder setActorRefBytes(
        * required uint64 systemUid = 2;
        * @return Whether the systemUid field is set.
        */
+      @java.lang.Override
       public boolean hasSystemUid() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -722,6 +696,7 @@ public boolean hasSystemUid() {
        * required uint64 systemUid = 2;
        * @return The systemUid.
        */
+      @java.lang.Override
       public long getSystemUid() {
         return systemUid_;
       }
@@ -731,8 +706,9 @@ public long getSystemUid() {
        * @return This builder for chaining.
        */
       public Builder setSystemUid(long value) {
-        bitField0_ |= 0x00000002;
+
         systemUid_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -752,6 +728,7 @@ public Builder clearSystemUid() {
        * optional int64 createdTimestamp = 3;
        * @return Whether the createdTimestamp field is set.
        */
+      @java.lang.Override
       public boolean hasCreatedTimestamp() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -759,6 +736,7 @@ public boolean hasCreatedTimestamp() {
        * optional int64 createdTimestamp = 3;
        * @return The createdTimestamp.
        */
+      @java.lang.Override
       public long getCreatedTimestamp() {
         return createdTimestamp_;
       }
@@ -768,8 +746,9 @@ public long getCreatedTimestamp() {
        * @return This builder for chaining.
        */
       public Builder setCreatedTimestamp(long value) {
-        bitField0_ |= 0x00000004;
+
         createdTimestamp_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -816,7 +795,18 @@ public ReceptionistEntry parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ReceptionistEntry(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -858,7 +848,7 @@ public interface PubSubMessagePublishedOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.typed.PubSubMessagePublished}
    */
-  public  static final class PubSubMessagePublished extends
+  public static final class PubSubMessagePublished extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.PubSubMessagePublished)
       PubSubMessagePublishedOrBuilder {
@@ -877,62 +867,6 @@ protected java.lang.Object newInstance(
       return new PubSubMessagePublished();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private PubSubMessagePublished(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = message_.toBuilder();
-              }
-              message_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(message_);
-                message_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_org_apache_pekko_cluster_typed_PubSubMessagePublished_descriptor;
@@ -953,6 +887,7 @@ private PubSubMessagePublished(
      * required .Payload message = 1;
      * @return Whether the message field is set.
      */
+    @java.lang.Override
     public boolean hasMessage() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -960,12 +895,14 @@ public boolean hasMessage() {
      * required .Payload message = 1;
      * @return The message.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.Payload getMessage() {
       return message_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
     }
     /**
      * required .Payload message = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder() {
       return message_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
     }
@@ -995,7 +932,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getMessage());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -1008,7 +945,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getMessage());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1028,7 +965,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getMessage()
             .equals(other.getMessage())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1043,7 +980,7 @@ public int hashCode() {
         hash = (37 * hash) + MESSAGE_FIELD_NUMBER;
         hash = (53 * hash) + getMessage().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1092,11 +1029,13 @@ public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.P
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -1177,12 +1116,12 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (messageBuilder_ == null) {
-          message_ = null;
-        } else {
-          messageBuilder_.clear();
+        bitField0_ = 0;
+        message_ = null;
+        if (messageBuilder_ != null) {
+          messageBuilder_.dispose();
+          messageBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -1209,19 +1148,21 @@ public org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMe
       @java.lang.Override
       public org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished buildPartial() {
         org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished result = new org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (messageBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = messageBuilder_.build();
-          }
+          result.message_ = messageBuilder_ == null
+              ? message_
+              : messageBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1271,7 +1212,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.Cluste
         if (other.hasMessage()) {
           mergeMessage(other.getMessage());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1292,17 +1233,37 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -1337,11 +1298,11 @@ public Builder setMessage(org.apache.pekko.remote.ContainerFormats.Payload value
             throw new NullPointerException();
           }
           message_ = value;
-          onChanged();
         } else {
           messageBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1351,11 +1312,11 @@ public Builder setMessage(
           org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (messageBuilder_ == null) {
           message_ = builderForValue.build();
-          onChanged();
         } else {
           messageBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1364,31 +1325,32 @@ public Builder setMessage(
       public Builder mergeMessage(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (messageBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              message_ != null &&
-              message_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
-            message_ =
-              org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(message_).mergeFrom(value).buildPartial();
+            message_ != null &&
+            message_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
+            getMessageBuilder().mergeFrom(value);
           } else {
             message_ = value;
           }
-          onChanged();
         } else {
           messageBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (message_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Payload message = 1;
        */
       public Builder clearMessage() {
-        if (messageBuilder_ == null) {
-          message_ = null;
-          onChanged();
-        } else {
-          messageBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        message_ = null;
+        if (messageBuilder_ != null) {
+          messageBuilder_.dispose();
+          messageBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -1459,7 +1421,18 @@ public PubSubMessagePublished parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new PubSubMessagePublished(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
diff --git a/cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ReliableDelivery.java b/cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ReliableDelivery.java
index 95872be7dfe..64be9c63664 100644
--- a/cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ReliableDelivery.java
+++ b/cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ReliableDelivery.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2020-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ReliableDelivery.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.cluster.typed.internal.protobuf;
 
 public final class ReliableDelivery {
@@ -142,7 +143,7 @@ public interface SequencedMessageOrBuilder extends
    *
    * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.SequencedMessage}
    */
-  public  static final class SequencedMessage extends
+  public static final class SequencedMessage extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.delivery.SequencedMessage)
       SequencedMessageOrBuilder {
@@ -163,99 +164,6 @@ protected java.lang.Object newInstance(
       return new SequencedMessage();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private SequencedMessage(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              producerId_ = bs;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              seqNr_ = input.readInt64();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              first_ = input.readBool();
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              ack_ = input.readBool();
-              break;
-            }
-            case 42: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000010;
-              producerControllerRef_ = bs;
-              break;
-            }
-            case 50: {
-              org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000020) != 0)) {
-                subBuilder = message_.toBuilder();
-              }
-              message_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(message_);
-                message_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000020;
-              break;
-            }
-            case 56: {
-              bitField0_ |= 0x00000040;
-              firstChunk_ = input.readBool();
-              break;
-            }
-            case 64: {
-              bitField0_ |= 0x00000080;
-              lastChunk_ = input.readBool();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_SequencedMessage_descriptor;
@@ -271,11 +179,13 @@ private SequencedMessage(
 
     private int bitField0_;
     public static final int PRODUCERID_FIELD_NUMBER = 1;
-    private volatile java.lang.Object producerId_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object producerId_ = "";
     /**
      * required string producerId = 1;
      * @return Whether the producerId field is set.
      */
+    @java.lang.Override
     public boolean hasProducerId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -283,6 +193,7 @@ public boolean hasProducerId() {
      * required string producerId = 1;
      * @return The producerId.
      */
+    @java.lang.Override
     public java.lang.String getProducerId() {
       java.lang.Object ref = producerId_;
       if (ref instanceof java.lang.String) {
@@ -301,6 +212,7 @@ public java.lang.String getProducerId() {
      * required string producerId = 1;
      * @return The bytes for producerId.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getProducerIdBytes() {
       java.lang.Object ref = producerId_;
@@ -316,11 +228,12 @@ public java.lang.String getProducerId() {
     }
 
     public static final int SEQNR_FIELD_NUMBER = 2;
-    private long seqNr_;
+    private long seqNr_ = 0L;
     /**
      * required int64 seqNr = 2;
      * @return Whether the seqNr field is set.
      */
+    @java.lang.Override
     public boolean hasSeqNr() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -328,16 +241,18 @@ public boolean hasSeqNr() {
      * required int64 seqNr = 2;
      * @return The seqNr.
      */
+    @java.lang.Override
     public long getSeqNr() {
       return seqNr_;
     }
 
     public static final int FIRST_FIELD_NUMBER = 3;
-    private boolean first_;
+    private boolean first_ = false;
     /**
      * required bool first = 3;
      * @return Whether the first field is set.
      */
+    @java.lang.Override
     public boolean hasFirst() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -345,16 +260,18 @@ public boolean hasFirst() {
      * required bool first = 3;
      * @return The first.
      */
+    @java.lang.Override
     public boolean getFirst() {
       return first_;
     }
 
     public static final int ACK_FIELD_NUMBER = 4;
-    private boolean ack_;
+    private boolean ack_ = false;
     /**
      * required bool ack = 4;
      * @return Whether the ack field is set.
      */
+    @java.lang.Override
     public boolean hasAck() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -362,16 +279,19 @@ public boolean hasAck() {
      * required bool ack = 4;
      * @return The ack.
      */
+    @java.lang.Override
     public boolean getAck() {
       return ack_;
     }
 
     public static final int PRODUCERCONTROLLERREF_FIELD_NUMBER = 5;
-    private volatile java.lang.Object producerControllerRef_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object producerControllerRef_ = "";
     /**
      * required string producerControllerRef = 5;
      * @return Whether the producerControllerRef field is set.
      */
+    @java.lang.Override
     public boolean hasProducerControllerRef() {
       return ((bitField0_ & 0x00000010) != 0);
     }
@@ -379,6 +299,7 @@ public boolean hasProducerControllerRef() {
      * required string producerControllerRef = 5;
      * @return The producerControllerRef.
      */
+    @java.lang.Override
     public java.lang.String getProducerControllerRef() {
       java.lang.Object ref = producerControllerRef_;
       if (ref instanceof java.lang.String) {
@@ -397,6 +318,7 @@ public java.lang.String getProducerControllerRef() {
      * required string producerControllerRef = 5;
      * @return The bytes for producerControllerRef.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getProducerControllerRefBytes() {
       java.lang.Object ref = producerControllerRef_;
@@ -417,6 +339,7 @@ public java.lang.String getProducerControllerRef() {
      * required .Payload message = 6;
      * @return Whether the message field is set.
      */
+    @java.lang.Override
     public boolean hasMessage() {
       return ((bitField0_ & 0x00000020) != 0);
     }
@@ -424,22 +347,25 @@ public boolean hasMessage() {
      * required .Payload message = 6;
      * @return The message.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.Payload getMessage() {
       return message_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
     }
     /**
      * required .Payload message = 6;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder() {
       return message_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
     }
 
     public static final int FIRSTCHUNK_FIELD_NUMBER = 7;
-    private boolean firstChunk_;
+    private boolean firstChunk_ = false;
     /**
      * optional bool firstChunk = 7;
      * @return Whether the firstChunk field is set.
      */
+    @java.lang.Override
     public boolean hasFirstChunk() {
       return ((bitField0_ & 0x00000040) != 0);
     }
@@ -447,16 +373,18 @@ public boolean hasFirstChunk() {
      * optional bool firstChunk = 7;
      * @return The firstChunk.
      */
+    @java.lang.Override
     public boolean getFirstChunk() {
       return firstChunk_;
     }
 
     public static final int LASTCHUNK_FIELD_NUMBER = 8;
-    private boolean lastChunk_;
+    private boolean lastChunk_ = false;
     /**
      * optional bool lastChunk = 8;
      * @return Whether the lastChunk field is set.
      */
+    @java.lang.Override
     public boolean hasLastChunk() {
       return ((bitField0_ & 0x00000080) != 0);
     }
@@ -464,6 +392,7 @@ public boolean hasLastChunk() {
      * optional bool lastChunk = 8;
      * @return The lastChunk.
      */
+    @java.lang.Override
     public boolean getLastChunk() {
       return lastChunk_;
     }
@@ -534,7 +463,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000080) != 0)) {
         output.writeBool(8, lastChunk_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -573,7 +502,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(8, lastChunk_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -628,7 +557,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getLastChunk()
             != other.getLastChunk()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -676,7 +605,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getLastChunk());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -725,11 +654,13 @@ public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -814,26 +745,19 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         producerId_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         seqNr_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
         first_ = false;
-        bitField0_ = (bitField0_ & ~0x00000004);
         ack_ = false;
-        bitField0_ = (bitField0_ & ~0x00000008);
         producerControllerRef_ = "";
-        bitField0_ = (bitField0_ & ~0x00000010);
-        if (messageBuilder_ == null) {
-          message_ = null;
-        } else {
-          messageBuilder_.clear();
+        message_ = null;
+        if (messageBuilder_ != null) {
+          messageBuilder_.dispose();
+          messageBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000020);
         firstChunk_ = false;
-        bitField0_ = (bitField0_ & ~0x00000040);
         lastChunk_ = false;
-        bitField0_ = (bitField0_ & ~0x00000080);
         return this;
       }
 
@@ -860,12 +784,18 @@ public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Sequenc
       @java.lang.Override
       public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage buildPartial() {
         org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage result = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.producerId_ = producerId_;
           to_bitField0_ |= 0x00000001;
         }
-        result.producerId_ = producerId_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.seqNr_ = seqNr_;
           to_bitField0_ |= 0x00000002;
@@ -879,15 +809,13 @@ public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Sequenc
           to_bitField0_ |= 0x00000008;
         }
         if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.producerControllerRef_ = producerControllerRef_;
           to_bitField0_ |= 0x00000010;
         }
-        result.producerControllerRef_ = producerControllerRef_;
         if (((from_bitField0_ & 0x00000020) != 0)) {
-          if (messageBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = messageBuilder_.build();
-          }
+          result.message_ = messageBuilder_ == null
+              ? message_
+              : messageBuilder_.build();
           to_bitField0_ |= 0x00000020;
         }
         if (((from_bitField0_ & 0x00000040) != 0)) {
@@ -898,9 +826,7 @@ public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Sequenc
           result.lastChunk_ = lastChunk_;
           to_bitField0_ |= 0x00000080;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -948,8 +874,8 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage other) {
         if (other == org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage.getDefaultInstance()) return this;
         if (other.hasProducerId()) {
-          bitField0_ |= 0x00000001;
           producerId_ = other.producerId_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasSeqNr()) {
@@ -962,8 +888,8 @@ public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.Reliab
           setAck(other.getAck());
         }
         if (other.hasProducerControllerRef()) {
-          bitField0_ |= 0x00000010;
           producerControllerRef_ = other.producerControllerRef_;
+          bitField0_ |= 0x00000010;
           onChanged();
         }
         if (other.hasMessage()) {
@@ -975,7 +901,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.Reliab
         if (other.hasLastChunk()) {
           setLastChunk(other.getLastChunk());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1011,17 +937,72 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                producerId_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                seqNr_ = input.readInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                first_ = input.readBool();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 32: {
+                ack_ = input.readBool();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              case 42: {
+                producerControllerRef_ = input.readBytes();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 42
+              case 50: {
+                input.readMessage(
+                    getMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000020;
+                break;
+              } // case 50
+              case 56: {
+                firstChunk_ = input.readBool();
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 56
+              case 64: {
+                lastChunk_ = input.readBool();
+                bitField0_ |= 0x00000080;
+                break;
+              } // case 64
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -1076,11 +1057,9 @@ public java.lang.String getProducerId() {
        */
       public Builder setProducerId(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         producerId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1089,8 +1068,8 @@ public Builder setProducerId(
        * @return This builder for chaining.
        */
       public Builder clearProducerId() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         producerId_ = getDefaultInstance().getProducerId();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1101,11 +1080,9 @@ public Builder clearProducerId() {
        */
       public Builder setProducerIdBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         producerId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1115,6 +1092,7 @@ public Builder setProducerIdBytes(
        * required int64 seqNr = 2;
        * @return Whether the seqNr field is set.
        */
+      @java.lang.Override
       public boolean hasSeqNr() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -1122,6 +1100,7 @@ public boolean hasSeqNr() {
        * required int64 seqNr = 2;
        * @return The seqNr.
        */
+      @java.lang.Override
       public long getSeqNr() {
         return seqNr_;
       }
@@ -1131,8 +1110,9 @@ public long getSeqNr() {
        * @return This builder for chaining.
        */
       public Builder setSeqNr(long value) {
-        bitField0_ |= 0x00000002;
+
         seqNr_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1152,6 +1132,7 @@ public Builder clearSeqNr() {
        * required bool first = 3;
        * @return Whether the first field is set.
        */
+      @java.lang.Override
       public boolean hasFirst() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -1159,6 +1140,7 @@ public boolean hasFirst() {
        * required bool first = 3;
        * @return The first.
        */
+      @java.lang.Override
       public boolean getFirst() {
         return first_;
       }
@@ -1168,8 +1150,9 @@ public boolean getFirst() {
        * @return This builder for chaining.
        */
       public Builder setFirst(boolean value) {
-        bitField0_ |= 0x00000004;
+
         first_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1189,6 +1172,7 @@ public Builder clearFirst() {
        * required bool ack = 4;
        * @return Whether the ack field is set.
        */
+      @java.lang.Override
       public boolean hasAck() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -1196,6 +1180,7 @@ public boolean hasAck() {
        * required bool ack = 4;
        * @return The ack.
        */
+      @java.lang.Override
       public boolean getAck() {
         return ack_;
       }
@@ -1205,8 +1190,9 @@ public boolean getAck() {
        * @return This builder for chaining.
        */
       public Builder setAck(boolean value) {
-        bitField0_ |= 0x00000008;
+
         ack_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -1271,11 +1257,9 @@ public java.lang.String getProducerControllerRef() {
        */
       public Builder setProducerControllerRef(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000010;
+        if (value == null) { throw new NullPointerException(); }
         producerControllerRef_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1284,8 +1268,8 @@ public Builder setProducerControllerRef(
        * @return This builder for chaining.
        */
       public Builder clearProducerControllerRef() {
-        bitField0_ = (bitField0_ & ~0x00000010);
         producerControllerRef_ = getDefaultInstance().getProducerControllerRef();
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
       }
@@ -1296,11 +1280,9 @@ public Builder clearProducerControllerRef() {
        */
       public Builder setProducerControllerRefBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000010;
+        if (value == null) { throw new NullPointerException(); }
         producerControllerRef_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1335,11 +1317,11 @@ public Builder setMessage(org.apache.pekko.remote.ContainerFormats.Payload value
             throw new NullPointerException();
           }
           message_ = value;
-          onChanged();
         } else {
           messageBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000020;
+        onChanged();
         return this;
       }
       /**
@@ -1349,11 +1331,11 @@ public Builder setMessage(
           org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (messageBuilder_ == null) {
           message_ = builderForValue.build();
-          onChanged();
         } else {
           messageBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000020;
+        onChanged();
         return this;
       }
       /**
@@ -1362,31 +1344,32 @@ public Builder setMessage(
       public Builder mergeMessage(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (messageBuilder_ == null) {
           if (((bitField0_ & 0x00000020) != 0) &&
-              message_ != null &&
-              message_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
-            message_ =
-              org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(message_).mergeFrom(value).buildPartial();
+            message_ != null &&
+            message_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
+            getMessageBuilder().mergeFrom(value);
           } else {
             message_ = value;
           }
-          onChanged();
         } else {
           messageBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000020;
+        if (message_ != null) {
+          bitField0_ |= 0x00000020;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Payload message = 6;
        */
       public Builder clearMessage() {
-        if (messageBuilder_ == null) {
-          message_ = null;
-          onChanged();
-        } else {
-          messageBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000020);
+        message_ = null;
+        if (messageBuilder_ != null) {
+          messageBuilder_.dispose();
+          messageBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -1430,6 +1413,7 @@ public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageOrBui
        * optional bool firstChunk = 7;
        * @return Whether the firstChunk field is set.
        */
+      @java.lang.Override
       public boolean hasFirstChunk() {
         return ((bitField0_ & 0x00000040) != 0);
       }
@@ -1437,6 +1421,7 @@ public boolean hasFirstChunk() {
        * optional bool firstChunk = 7;
        * @return The firstChunk.
        */
+      @java.lang.Override
       public boolean getFirstChunk() {
         return firstChunk_;
       }
@@ -1446,8 +1431,9 @@ public boolean getFirstChunk() {
        * @return This builder for chaining.
        */
       public Builder setFirstChunk(boolean value) {
-        bitField0_ |= 0x00000040;
+
         firstChunk_ = value;
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -1467,6 +1453,7 @@ public Builder clearFirstChunk() {
        * optional bool lastChunk = 8;
        * @return Whether the lastChunk field is set.
        */
+      @java.lang.Override
       public boolean hasLastChunk() {
         return ((bitField0_ & 0x00000080) != 0);
       }
@@ -1474,6 +1461,7 @@ public boolean hasLastChunk() {
        * optional bool lastChunk = 8;
        * @return The lastChunk.
        */
+      @java.lang.Override
       public boolean getLastChunk() {
         return lastChunk_;
       }
@@ -1483,8 +1471,9 @@ public boolean getLastChunk() {
        * @return This builder for chaining.
        */
       public Builder setLastChunk(boolean value) {
-        bitField0_ |= 0x00000080;
+
         lastChunk_ = value;
+        bitField0_ |= 0x00000080;
         onChanged();
         return this;
       }
@@ -1531,7 +1520,18 @@ public SequencedMessage parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new SequencedMessage(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -1579,7 +1579,7 @@ public interface RegisterConsumerOrBuilder extends
    *
    * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.RegisterConsumer}
    */
-  public  static final class RegisterConsumer extends
+  public static final class RegisterConsumer extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.delivery.RegisterConsumer)
       RegisterConsumerOrBuilder {
@@ -1599,55 +1599,6 @@ protected java.lang.Object newInstance(
       return new RegisterConsumer();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private RegisterConsumer(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              consumerControllerRef_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_RegisterConsumer_descriptor;
@@ -1663,11 +1614,13 @@ private RegisterConsumer(
 
     private int bitField0_;
     public static final int CONSUMERCONTROLLERREF_FIELD_NUMBER = 1;
-    private volatile java.lang.Object consumerControllerRef_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object consumerControllerRef_ = "";
     /**
      * required string consumerControllerRef = 1;
      * @return Whether the consumerControllerRef field is set.
      */
+    @java.lang.Override
     public boolean hasConsumerControllerRef() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -1675,6 +1628,7 @@ public boolean hasConsumerControllerRef() {
      * required string consumerControllerRef = 1;
      * @return The consumerControllerRef.
      */
+    @java.lang.Override
     public java.lang.String getConsumerControllerRef() {
       java.lang.Object ref = consumerControllerRef_;
       if (ref instanceof java.lang.String) {
@@ -1693,6 +1647,7 @@ public java.lang.String getConsumerControllerRef() {
      * required string consumerControllerRef = 1;
      * @return The bytes for consumerControllerRef.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getConsumerControllerRefBytes() {
       java.lang.Object ref = consumerControllerRef_;
@@ -1728,7 +1683,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, consumerControllerRef_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -1740,7 +1695,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000001) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, consumerControllerRef_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1760,7 +1715,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getConsumerControllerRef()
             .equals(other.getConsumerControllerRef())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1775,7 +1730,7 @@ public int hashCode() {
         hash = (37 * hash) + CONSUMERCONTROLLERREF_FIELD_NUMBER;
         hash = (53 * hash) + getConsumerControllerRef().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1824,11 +1779,13 @@ public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -1896,24 +1853,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         consumerControllerRef_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -1940,15 +1892,19 @@ public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Registe
       @java.lang.Override
       public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer buildPartial() {
         org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer result = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.consumerControllerRef_ = consumerControllerRef_;
           to_bitField0_ |= 0x00000001;
         }
-        result.consumerControllerRef_ = consumerControllerRef_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1996,11 +1952,11 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer other) {
         if (other == org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer.getDefaultInstance()) return this;
         if (other.hasConsumerControllerRef()) {
-          bitField0_ |= 0x00000001;
           consumerControllerRef_ = other.consumerControllerRef_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -2018,17 +1974,35 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                consumerControllerRef_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -2083,11 +2057,9 @@ public java.lang.String getConsumerControllerRef() {
        */
       public Builder setConsumerControllerRef(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         consumerControllerRef_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2096,8 +2068,8 @@ public Builder setConsumerControllerRef(
        * @return This builder for chaining.
        */
       public Builder clearConsumerControllerRef() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         consumerControllerRef_ = getDefaultInstance().getConsumerControllerRef();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -2108,11 +2080,9 @@ public Builder clearConsumerControllerRef() {
        */
       public Builder setConsumerControllerRefBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         consumerControllerRef_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2149,7 +2119,18 @@ public RegisterConsumer parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new RegisterConsumer(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -2224,7 +2205,7 @@ public interface RequestOrBuilder extends
    *
    * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.Request}
    */
-  public  static final class Request extends
+  public static final class Request extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.delivery.Request)
       RequestOrBuilder {
@@ -2243,69 +2224,6 @@ protected java.lang.Object newInstance(
       return new Request();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Request(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              confirmedSeqNr_ = input.readInt64();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              requestUpToSeqNr_ = input.readInt64();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              supportResend_ = input.readBool();
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              viaTimeout_ = input.readBool();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Request_descriptor;
@@ -2321,11 +2239,12 @@ private Request(
 
     private int bitField0_;
     public static final int CONFIRMEDSEQNR_FIELD_NUMBER = 1;
-    private long confirmedSeqNr_;
+    private long confirmedSeqNr_ = 0L;
     /**
      * required int64 confirmedSeqNr = 1;
      * @return Whether the confirmedSeqNr field is set.
      */
+    @java.lang.Override
     public boolean hasConfirmedSeqNr() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -2333,16 +2252,18 @@ public boolean hasConfirmedSeqNr() {
      * required int64 confirmedSeqNr = 1;
      * @return The confirmedSeqNr.
      */
+    @java.lang.Override
     public long getConfirmedSeqNr() {
       return confirmedSeqNr_;
     }
 
     public static final int REQUESTUPTOSEQNR_FIELD_NUMBER = 2;
-    private long requestUpToSeqNr_;
+    private long requestUpToSeqNr_ = 0L;
     /**
      * required int64 requestUpToSeqNr = 2;
      * @return Whether the requestUpToSeqNr field is set.
      */
+    @java.lang.Override
     public boolean hasRequestUpToSeqNr() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -2350,16 +2271,18 @@ public boolean hasRequestUpToSeqNr() {
      * required int64 requestUpToSeqNr = 2;
      * @return The requestUpToSeqNr.
      */
+    @java.lang.Override
     public long getRequestUpToSeqNr() {
       return requestUpToSeqNr_;
     }
 
     public static final int SUPPORTRESEND_FIELD_NUMBER = 3;
-    private boolean supportResend_;
+    private boolean supportResend_ = false;
     /**
      * required bool supportResend = 3;
      * @return Whether the supportResend field is set.
      */
+    @java.lang.Override
     public boolean hasSupportResend() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -2367,16 +2290,18 @@ public boolean hasSupportResend() {
      * required bool supportResend = 3;
      * @return The supportResend.
      */
+    @java.lang.Override
     public boolean getSupportResend() {
       return supportResend_;
     }
 
     public static final int VIATIMEOUT_FIELD_NUMBER = 4;
-    private boolean viaTimeout_;
+    private boolean viaTimeout_ = false;
     /**
      * required bool viaTimeout = 4;
      * @return Whether the viaTimeout field is set.
      */
+    @java.lang.Override
     public boolean hasViaTimeout() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -2384,6 +2309,7 @@ public boolean hasViaTimeout() {
      * required bool viaTimeout = 4;
      * @return The viaTimeout.
      */
+    @java.lang.Override
     public boolean getViaTimeout() {
       return viaTimeout_;
     }
@@ -2430,7 +2356,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeBool(4, viaTimeout_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -2455,7 +2381,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(4, viaTimeout_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2490,7 +2416,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getViaTimeout()
             != other.getViaTimeout()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -2521,7 +2447,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getViaTimeout());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -2570,11 +2496,13 @@ public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -2642,30 +2570,22 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         confirmedSeqNr_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         requestUpToSeqNr_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
         supportResend_ = false;
-        bitField0_ = (bitField0_ & ~0x00000004);
         viaTimeout_ = false;
-        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -2692,6 +2612,12 @@ public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request
       @java.lang.Override
       public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request buildPartial() {
         org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request result = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -2710,9 +2636,7 @@ public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request
           result.viaTimeout_ = viaTimeout_;
           to_bitField0_ |= 0x00000008;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -2771,7 +2695,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.Reliab
         if (other.hasViaTimeout()) {
           setViaTimeout(other.getViaTimeout());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -2798,17 +2722,50 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                confirmedSeqNr_ = input.readInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 16: {
+                requestUpToSeqNr_ = input.readInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                supportResend_ = input.readBool();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 32: {
+                viaTimeout_ = input.readBool();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -2818,6 +2775,7 @@ public Builder mergeFrom(
        * required int64 confirmedSeqNr = 1;
        * @return Whether the confirmedSeqNr field is set.
        */
+      @java.lang.Override
       public boolean hasConfirmedSeqNr() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -2825,6 +2783,7 @@ public boolean hasConfirmedSeqNr() {
        * required int64 confirmedSeqNr = 1;
        * @return The confirmedSeqNr.
        */
+      @java.lang.Override
       public long getConfirmedSeqNr() {
         return confirmedSeqNr_;
       }
@@ -2834,8 +2793,9 @@ public long getConfirmedSeqNr() {
        * @return This builder for chaining.
        */
       public Builder setConfirmedSeqNr(long value) {
-        bitField0_ |= 0x00000001;
+
         confirmedSeqNr_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2855,6 +2815,7 @@ public Builder clearConfirmedSeqNr() {
        * required int64 requestUpToSeqNr = 2;
        * @return Whether the requestUpToSeqNr field is set.
        */
+      @java.lang.Override
       public boolean hasRequestUpToSeqNr() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -2862,6 +2823,7 @@ public boolean hasRequestUpToSeqNr() {
        * required int64 requestUpToSeqNr = 2;
        * @return The requestUpToSeqNr.
        */
+      @java.lang.Override
       public long getRequestUpToSeqNr() {
         return requestUpToSeqNr_;
       }
@@ -2871,8 +2833,9 @@ public long getRequestUpToSeqNr() {
        * @return This builder for chaining.
        */
       public Builder setRequestUpToSeqNr(long value) {
-        bitField0_ |= 0x00000002;
+
         requestUpToSeqNr_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2892,6 +2855,7 @@ public Builder clearRequestUpToSeqNr() {
        * required bool supportResend = 3;
        * @return Whether the supportResend field is set.
        */
+      @java.lang.Override
       public boolean hasSupportResend() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -2899,6 +2863,7 @@ public boolean hasSupportResend() {
        * required bool supportResend = 3;
        * @return The supportResend.
        */
+      @java.lang.Override
       public boolean getSupportResend() {
         return supportResend_;
       }
@@ -2908,8 +2873,9 @@ public boolean getSupportResend() {
        * @return This builder for chaining.
        */
       public Builder setSupportResend(boolean value) {
-        bitField0_ |= 0x00000004;
+
         supportResend_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -2929,6 +2895,7 @@ public Builder clearSupportResend() {
        * required bool viaTimeout = 4;
        * @return Whether the viaTimeout field is set.
        */
+      @java.lang.Override
       public boolean hasViaTimeout() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -2936,6 +2903,7 @@ public boolean hasViaTimeout() {
        * required bool viaTimeout = 4;
        * @return The viaTimeout.
        */
+      @java.lang.Override
       public boolean getViaTimeout() {
         return viaTimeout_;
       }
@@ -2945,8 +2913,9 @@ public boolean getViaTimeout() {
        * @return This builder for chaining.
        */
       public Builder setViaTimeout(boolean value) {
-        bitField0_ |= 0x00000008;
+
         viaTimeout_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -2993,7 +2962,18 @@ public Request parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Request(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -3035,7 +3015,7 @@ public interface ResendOrBuilder extends
    *
    * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.Resend}
    */
-  public  static final class Resend extends
+  public static final class Resend extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.delivery.Resend)
       ResendOrBuilder {
@@ -3054,54 +3034,6 @@ protected java.lang.Object newInstance(
       return new Resend();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Resend(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              fromSeqNr_ = input.readInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Resend_descriptor;
@@ -3117,11 +3049,12 @@ private Resend(
 
     private int bitField0_;
     public static final int FROMSEQNR_FIELD_NUMBER = 1;
-    private long fromSeqNr_;
+    private long fromSeqNr_ = 0L;
     /**
      * required int64 fromSeqNr = 1;
      * @return Whether the fromSeqNr field is set.
      */
+    @java.lang.Override
     public boolean hasFromSeqNr() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -3129,6 +3062,7 @@ public boolean hasFromSeqNr() {
      * required int64 fromSeqNr = 1;
      * @return The fromSeqNr.
      */
+    @java.lang.Override
     public long getFromSeqNr() {
       return fromSeqNr_;
     }
@@ -3154,7 +3088,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeInt64(1, fromSeqNr_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -3167,7 +3101,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(1, fromSeqNr_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -3187,7 +3121,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getFromSeqNr()
             != other.getFromSeqNr()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -3203,7 +3137,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getFromSeqNr());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3252,11 +3186,13 @@ public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -3324,24 +3260,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         fromSeqNr_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -3368,15 +3299,19 @@ public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend
       @java.lang.Override
       public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend buildPartial() {
         org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend result = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.fromSeqNr_ = fromSeqNr_;
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -3426,7 +3361,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.Reliab
         if (other.hasFromSeqNr()) {
           setFromSeqNr(other.getFromSeqNr());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -3444,17 +3379,35 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                fromSeqNr_ = input.readInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -3464,6 +3417,7 @@ public Builder mergeFrom(
        * required int64 fromSeqNr = 1;
        * @return Whether the fromSeqNr field is set.
        */
+      @java.lang.Override
       public boolean hasFromSeqNr() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -3471,6 +3425,7 @@ public boolean hasFromSeqNr() {
        * required int64 fromSeqNr = 1;
        * @return The fromSeqNr.
        */
+      @java.lang.Override
       public long getFromSeqNr() {
         return fromSeqNr_;
       }
@@ -3480,8 +3435,9 @@ public long getFromSeqNr() {
        * @return This builder for chaining.
        */
       public Builder setFromSeqNr(long value) {
-        bitField0_ |= 0x00000001;
+
         fromSeqNr_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -3528,7 +3484,18 @@ public Resend parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Resend(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -3570,7 +3537,7 @@ public interface AckOrBuilder extends
    *
    * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.Ack}
    */
-  public  static final class Ack extends
+  public static final class Ack extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.delivery.Ack)
       AckOrBuilder {
@@ -3589,54 +3556,6 @@ protected java.lang.Object newInstance(
       return new Ack();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Ack(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              confirmedSeqNr_ = input.readInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Ack_descriptor;
@@ -3652,11 +3571,12 @@ private Ack(
 
     private int bitField0_;
     public static final int CONFIRMEDSEQNR_FIELD_NUMBER = 1;
-    private long confirmedSeqNr_;
+    private long confirmedSeqNr_ = 0L;
     /**
      * required int64 confirmedSeqNr = 1;
      * @return Whether the confirmedSeqNr field is set.
      */
+    @java.lang.Override
     public boolean hasConfirmedSeqNr() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -3664,6 +3584,7 @@ public boolean hasConfirmedSeqNr() {
      * required int64 confirmedSeqNr = 1;
      * @return The confirmedSeqNr.
      */
+    @java.lang.Override
     public long getConfirmedSeqNr() {
       return confirmedSeqNr_;
     }
@@ -3689,7 +3610,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeInt64(1, confirmedSeqNr_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -3702,7 +3623,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(1, confirmedSeqNr_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -3722,7 +3643,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getConfirmedSeqNr()
             != other.getConfirmedSeqNr()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -3738,7 +3659,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getConfirmedSeqNr());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3787,11 +3708,13 @@ public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -3859,24 +3782,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         confirmedSeqNr_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -3903,15 +3821,19 @@ public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack bui
       @java.lang.Override
       public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack buildPartial() {
         org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack result = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.confirmedSeqNr_ = confirmedSeqNr_;
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -3961,7 +3883,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.Reliab
         if (other.hasConfirmedSeqNr()) {
           setConfirmedSeqNr(other.getConfirmedSeqNr());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -3979,17 +3901,35 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                confirmedSeqNr_ = input.readInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -3999,6 +3939,7 @@ public Builder mergeFrom(
        * required int64 confirmedSeqNr = 1;
        * @return Whether the confirmedSeqNr field is set.
        */
+      @java.lang.Override
       public boolean hasConfirmedSeqNr() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -4006,6 +3947,7 @@ public boolean hasConfirmedSeqNr() {
        * required int64 confirmedSeqNr = 1;
        * @return The confirmedSeqNr.
        */
+      @java.lang.Override
       public long getConfirmedSeqNr() {
         return confirmedSeqNr_;
       }
@@ -4015,8 +3957,9 @@ public long getConfirmedSeqNr() {
        * @return This builder for chaining.
        */
       public Builder setConfirmedSeqNr(long value) {
-        bitField0_ |= 0x00000001;
+
         confirmedSeqNr_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4063,7 +4006,18 @@ public Ack parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Ack(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -4164,7 +4118,7 @@ org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSentOrB
    *
    * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.State}
    */
-  public  static final class State extends
+  public static final class State extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.delivery.State)
       StateOrBuilder {
@@ -4185,83 +4139,6 @@ protected java.lang.Object newInstance(
       return new State();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private State(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              currentSeqNr_ = input.readInt64();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              highestConfirmedSeqNr_ = input.readInt64();
-              break;
-            }
-            case 26: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                confirmed_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              confirmed_.add(
-                  input.readMessage(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.PARSER, extensionRegistry));
-              break;
-            }
-            case 34: {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                unconfirmed_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              unconfirmed_.add(
-                  input.readMessage(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          confirmed_ = java.util.Collections.unmodifiableList(confirmed_);
-        }
-        if (((mutable_bitField0_ & 0x00000008) != 0)) {
-          unconfirmed_ = java.util.Collections.unmodifiableList(unconfirmed_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_State_descriptor;
@@ -4277,11 +4154,12 @@ private State(
 
     private int bitField0_;
     public static final int CURRENTSEQNR_FIELD_NUMBER = 1;
-    private long currentSeqNr_;
+    private long currentSeqNr_ = 0L;
     /**
      * required int64 currentSeqNr = 1;
      * @return Whether the currentSeqNr field is set.
      */
+    @java.lang.Override
     public boolean hasCurrentSeqNr() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -4289,16 +4167,18 @@ public boolean hasCurrentSeqNr() {
      * required int64 currentSeqNr = 1;
      * @return The currentSeqNr.
      */
+    @java.lang.Override
     public long getCurrentSeqNr() {
       return currentSeqNr_;
     }
 
     public static final int HIGHESTCONFIRMEDSEQNR_FIELD_NUMBER = 2;
-    private long highestConfirmedSeqNr_;
+    private long highestConfirmedSeqNr_ = 0L;
     /**
      * required int64 highestConfirmedSeqNr = 2;
      * @return Whether the highestConfirmedSeqNr field is set.
      */
+    @java.lang.Override
     public boolean hasHighestConfirmedSeqNr() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -4306,21 +4186,25 @@ public boolean hasHighestConfirmedSeqNr() {
      * required int64 highestConfirmedSeqNr = 2;
      * @return The highestConfirmedSeqNr.
      */
+    @java.lang.Override
     public long getHighestConfirmedSeqNr() {
       return highestConfirmedSeqNr_;
     }
 
     public static final int CONFIRMED_FIELD_NUMBER = 3;
+    @SuppressWarnings("serial")
     private java.util.List confirmed_;
     /**
      * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
      */
+    @java.lang.Override
     public java.util.List getConfirmedList() {
       return confirmed_;
     }
     /**
      * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
      */
+    @java.lang.Override
     public java.util.List 
         getConfirmedOrBuilderList() {
       return confirmed_;
@@ -4328,34 +4212,40 @@ public java.util.Listrepeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
      */
+    @java.lang.Override
     public int getConfirmedCount() {
       return confirmed_.size();
     }
     /**
      * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed getConfirmed(int index) {
       return confirmed_.get(index);
     }
     /**
      * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.ConfirmedOrBuilder getConfirmedOrBuilder(
         int index) {
       return confirmed_.get(index);
     }
 
     public static final int UNCONFIRMED_FIELD_NUMBER = 4;
+    @SuppressWarnings("serial")
     private java.util.List unconfirmed_;
     /**
      * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
      */
+    @java.lang.Override
     public java.util.List getUnconfirmedList() {
       return unconfirmed_;
     }
     /**
      * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
      */
+    @java.lang.Override
     public java.util.List 
         getUnconfirmedOrBuilderList() {
       return unconfirmed_;
@@ -4363,18 +4253,21 @@ public java.util.Listrepeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
      */
+    @java.lang.Override
     public int getUnconfirmedCount() {
       return unconfirmed_.size();
     }
     /**
      * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent getUnconfirmed(int index) {
       return unconfirmed_.get(index);
     }
     /**
      * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSentOrBuilder getUnconfirmedOrBuilder(
         int index) {
       return unconfirmed_.get(index);
@@ -4426,7 +4319,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < unconfirmed_.size(); i++) {
         output.writeMessage(4, unconfirmed_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -4451,7 +4344,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(4, unconfirmed_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4480,7 +4373,7 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getConfirmedList())) return false;
       if (!getUnconfirmedList()
           .equals(other.getUnconfirmedList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -4509,7 +4402,7 @@ public int hashCode() {
         hash = (37 * hash) + UNCONFIRMED_FIELD_NUMBER;
         hash = (53 * hash) + getUnconfirmedList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4558,11 +4451,13 @@ public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -4630,40 +4525,34 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getConfirmedFieldBuilder();
-          getUnconfirmedFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         currentSeqNr_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         highestConfirmedSeqNr_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
         if (confirmedBuilder_ == null) {
           confirmed_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
         } else {
+          confirmed_ = null;
           confirmedBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000004);
         if (unconfirmedBuilder_ == null) {
           unconfirmed_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
+          unconfirmed_ = null;
           unconfirmedBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -4690,16 +4579,13 @@ public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State b
       @java.lang.Override
       public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State buildPartial() {
         org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State result = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.currentSeqNr_ = currentSeqNr_;
-          to_bitField0_ |= 0x00000001;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.highestConfirmedSeqNr_ = highestConfirmedSeqNr_;
-          to_bitField0_ |= 0x00000002;
-        }
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State result) {
         if (confirmedBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0)) {
             confirmed_ = java.util.Collections.unmodifiableList(confirmed_);
@@ -4718,9 +4604,20 @@ public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State b
         } else {
           result.unconfirmed_ = unconfirmedBuilder_.build();
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.currentSeqNr_ = currentSeqNr_;
+          to_bitField0_ |= 0x00000001;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.highestConfirmedSeqNr_ = highestConfirmedSeqNr_;
+          to_bitField0_ |= 0x00000002;
+        }
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -4825,7 +4722,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.Reliab
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -4856,17 +4753,66 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                currentSeqNr_ = input.readInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 16: {
+                highestConfirmedSeqNr_ = input.readInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 26: {
+                org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.PARSER,
+                        extensionRegistry);
+                if (confirmedBuilder_ == null) {
+                  ensureConfirmedIsMutable();
+                  confirmed_.add(m);
+                } else {
+                  confirmedBuilder_.addMessage(m);
+                }
+                break;
+              } // case 26
+              case 34: {
+                org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.PARSER,
+                        extensionRegistry);
+                if (unconfirmedBuilder_ == null) {
+                  ensureUnconfirmedIsMutable();
+                  unconfirmed_.add(m);
+                } else {
+                  unconfirmedBuilder_.addMessage(m);
+                }
+                break;
+              } // case 34
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -4876,6 +4822,7 @@ public Builder mergeFrom(
        * required int64 currentSeqNr = 1;
        * @return Whether the currentSeqNr field is set.
        */
+      @java.lang.Override
       public boolean hasCurrentSeqNr() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -4883,6 +4830,7 @@ public boolean hasCurrentSeqNr() {
        * required int64 currentSeqNr = 1;
        * @return The currentSeqNr.
        */
+      @java.lang.Override
       public long getCurrentSeqNr() {
         return currentSeqNr_;
       }
@@ -4892,8 +4840,9 @@ public long getCurrentSeqNr() {
        * @return This builder for chaining.
        */
       public Builder setCurrentSeqNr(long value) {
-        bitField0_ |= 0x00000001;
+
         currentSeqNr_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4913,6 +4862,7 @@ public Builder clearCurrentSeqNr() {
        * required int64 highestConfirmedSeqNr = 2;
        * @return Whether the highestConfirmedSeqNr field is set.
        */
+      @java.lang.Override
       public boolean hasHighestConfirmedSeqNr() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -4920,6 +4870,7 @@ public boolean hasHighestConfirmedSeqNr() {
        * required int64 highestConfirmedSeqNr = 2;
        * @return The highestConfirmedSeqNr.
        */
+      @java.lang.Override
       public long getHighestConfirmedSeqNr() {
         return highestConfirmedSeqNr_;
       }
@@ -4929,8 +4880,9 @@ public long getHighestConfirmedSeqNr() {
        * @return This builder for chaining.
        */
       public Builder setHighestConfirmedSeqNr(long value) {
-        bitField0_ |= 0x00000002;
+
         highestConfirmedSeqNr_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -5457,7 +5409,18 @@ public State parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new State(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -5527,7 +5490,7 @@ public interface ConfirmedOrBuilder extends
    *
    * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.Confirmed}
    */
-  public  static final class Confirmed extends
+  public static final class Confirmed extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.delivery.Confirmed)
       ConfirmedOrBuilder {
@@ -5547,65 +5510,6 @@ protected java.lang.Object newInstance(
       return new Confirmed();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Confirmed(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              seqNr_ = input.readInt64();
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              qualifier_ = bs;
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              timestamp_ = input.readInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Confirmed_descriptor;
@@ -5621,11 +5525,12 @@ private Confirmed(
 
     private int bitField0_;
     public static final int SEQNR_FIELD_NUMBER = 1;
-    private long seqNr_;
+    private long seqNr_ = 0L;
     /**
      * required int64 seqNr = 1;
      * @return Whether the seqNr field is set.
      */
+    @java.lang.Override
     public boolean hasSeqNr() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -5633,16 +5538,19 @@ public boolean hasSeqNr() {
      * required int64 seqNr = 1;
      * @return The seqNr.
      */
+    @java.lang.Override
     public long getSeqNr() {
       return seqNr_;
     }
 
     public static final int QUALIFIER_FIELD_NUMBER = 2;
-    private volatile java.lang.Object qualifier_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object qualifier_ = "";
     /**
      * required string qualifier = 2;
      * @return Whether the qualifier field is set.
      */
+    @java.lang.Override
     public boolean hasQualifier() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -5650,6 +5558,7 @@ public boolean hasQualifier() {
      * required string qualifier = 2;
      * @return The qualifier.
      */
+    @java.lang.Override
     public java.lang.String getQualifier() {
       java.lang.Object ref = qualifier_;
       if (ref instanceof java.lang.String) {
@@ -5668,6 +5577,7 @@ public java.lang.String getQualifier() {
      * required string qualifier = 2;
      * @return The bytes for qualifier.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getQualifierBytes() {
       java.lang.Object ref = qualifier_;
@@ -5683,11 +5593,12 @@ public java.lang.String getQualifier() {
     }
 
     public static final int TIMESTAMP_FIELD_NUMBER = 3;
-    private long timestamp_;
+    private long timestamp_ = 0L;
     /**
      * required int64 timestamp = 3;
      * @return Whether the timestamp field is set.
      */
+    @java.lang.Override
     public boolean hasTimestamp() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -5695,6 +5606,7 @@ public boolean hasTimestamp() {
      * required int64 timestamp = 3;
      * @return The timestamp.
      */
+    @java.lang.Override
     public long getTimestamp() {
       return timestamp_;
     }
@@ -5734,7 +5646,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeInt64(3, timestamp_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -5754,7 +5666,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(3, timestamp_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5784,7 +5696,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getTimestamp()
             != other.getTimestamp()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -5809,7 +5721,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getTimestamp());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -5858,11 +5770,13 @@ public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -5930,28 +5844,21 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         seqNr_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         qualifier_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         timestamp_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -5978,6 +5885,12 @@ public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirm
       @java.lang.Override
       public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed buildPartial() {
         org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed result = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -5985,16 +5898,14 @@ public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirm
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.qualifier_ = qualifier_;
           to_bitField0_ |= 0x00000002;
         }
-        result.qualifier_ = qualifier_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.timestamp_ = timestamp_;
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -6045,14 +5956,14 @@ public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.Reliab
           setSeqNr(other.getSeqNr());
         }
         if (other.hasQualifier()) {
-          bitField0_ |= 0x00000002;
           qualifier_ = other.qualifier_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasTimestamp()) {
           setTimestamp(other.getTimestamp());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -6076,17 +5987,45 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                seqNr_ = input.readInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 18: {
+                qualifier_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 24: {
+                timestamp_ = input.readInt64();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -6096,6 +6035,7 @@ public Builder mergeFrom(
        * required int64 seqNr = 1;
        * @return Whether the seqNr field is set.
        */
+      @java.lang.Override
       public boolean hasSeqNr() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -6103,6 +6043,7 @@ public boolean hasSeqNr() {
        * required int64 seqNr = 1;
        * @return The seqNr.
        */
+      @java.lang.Override
       public long getSeqNr() {
         return seqNr_;
       }
@@ -6112,8 +6053,9 @@ public long getSeqNr() {
        * @return This builder for chaining.
        */
       public Builder setSeqNr(long value) {
-        bitField0_ |= 0x00000001;
+
         seqNr_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -6178,11 +6120,9 @@ public java.lang.String getQualifier() {
        */
       public Builder setQualifier(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         qualifier_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -6191,8 +6131,8 @@ public Builder setQualifier(
        * @return This builder for chaining.
        */
       public Builder clearQualifier() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         qualifier_ = getDefaultInstance().getQualifier();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -6203,11 +6143,9 @@ public Builder clearQualifier() {
        */
       public Builder setQualifierBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         qualifier_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -6217,6 +6155,7 @@ public Builder setQualifierBytes(
        * required int64 timestamp = 3;
        * @return Whether the timestamp field is set.
        */
+      @java.lang.Override
       public boolean hasTimestamp() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -6224,6 +6163,7 @@ public boolean hasTimestamp() {
        * required int64 timestamp = 3;
        * @return The timestamp.
        */
+      @java.lang.Override
       public long getTimestamp() {
         return timestamp_;
       }
@@ -6233,8 +6173,9 @@ public long getTimestamp() {
        * @return This builder for chaining.
        */
       public Builder setTimestamp(long value) {
-        bitField0_ |= 0x00000004;
+
         timestamp_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -6281,7 +6222,18 @@ public Confirmed parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Confirmed(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -6399,7 +6351,7 @@ public interface MessageSentOrBuilder extends
    *
    * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.MessageSent}
    */
-  public  static final class MessageSent extends
+  public static final class MessageSent extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.delivery.MessageSent)
       MessageSentOrBuilder {
@@ -6419,93 +6371,6 @@ protected java.lang.Object newInstance(
       return new MessageSent();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private MessageSent(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              seqNr_ = input.readInt64();
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              qualifier_ = bs;
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              ack_ = input.readBool();
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              timestamp_ = input.readInt64();
-              break;
-            }
-            case 42: {
-              org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000010) != 0)) {
-                subBuilder = message_.toBuilder();
-              }
-              message_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(message_);
-                message_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000010;
-              break;
-            }
-            case 48: {
-              bitField0_ |= 0x00000020;
-              firstChunk_ = input.readBool();
-              break;
-            }
-            case 56: {
-              bitField0_ |= 0x00000040;
-              lastChunk_ = input.readBool();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_MessageSent_descriptor;
@@ -6521,11 +6386,12 @@ private MessageSent(
 
     private int bitField0_;
     public static final int SEQNR_FIELD_NUMBER = 1;
-    private long seqNr_;
+    private long seqNr_ = 0L;
     /**
      * required int64 seqNr = 1;
      * @return Whether the seqNr field is set.
      */
+    @java.lang.Override
     public boolean hasSeqNr() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -6533,16 +6399,19 @@ public boolean hasSeqNr() {
      * required int64 seqNr = 1;
      * @return The seqNr.
      */
+    @java.lang.Override
     public long getSeqNr() {
       return seqNr_;
     }
 
     public static final int QUALIFIER_FIELD_NUMBER = 2;
-    private volatile java.lang.Object qualifier_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object qualifier_ = "";
     /**
      * required string qualifier = 2;
      * @return Whether the qualifier field is set.
      */
+    @java.lang.Override
     public boolean hasQualifier() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -6550,6 +6419,7 @@ public boolean hasQualifier() {
      * required string qualifier = 2;
      * @return The qualifier.
      */
+    @java.lang.Override
     public java.lang.String getQualifier() {
       java.lang.Object ref = qualifier_;
       if (ref instanceof java.lang.String) {
@@ -6568,6 +6438,7 @@ public java.lang.String getQualifier() {
      * required string qualifier = 2;
      * @return The bytes for qualifier.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getQualifierBytes() {
       java.lang.Object ref = qualifier_;
@@ -6583,11 +6454,12 @@ public java.lang.String getQualifier() {
     }
 
     public static final int ACK_FIELD_NUMBER = 3;
-    private boolean ack_;
+    private boolean ack_ = false;
     /**
      * required bool ack = 3;
      * @return Whether the ack field is set.
      */
+    @java.lang.Override
     public boolean hasAck() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -6595,16 +6467,18 @@ public boolean hasAck() {
      * required bool ack = 3;
      * @return The ack.
      */
+    @java.lang.Override
     public boolean getAck() {
       return ack_;
     }
 
     public static final int TIMESTAMP_FIELD_NUMBER = 4;
-    private long timestamp_;
+    private long timestamp_ = 0L;
     /**
      * required int64 timestamp = 4;
      * @return Whether the timestamp field is set.
      */
+    @java.lang.Override
     public boolean hasTimestamp() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -6612,6 +6486,7 @@ public boolean hasTimestamp() {
      * required int64 timestamp = 4;
      * @return The timestamp.
      */
+    @java.lang.Override
     public long getTimestamp() {
       return timestamp_;
     }
@@ -6622,6 +6497,7 @@ public long getTimestamp() {
      * required .Payload message = 5;
      * @return Whether the message field is set.
      */
+    @java.lang.Override
     public boolean hasMessage() {
       return ((bitField0_ & 0x00000010) != 0);
     }
@@ -6629,22 +6505,25 @@ public boolean hasMessage() {
      * required .Payload message = 5;
      * @return The message.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.Payload getMessage() {
       return message_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
     }
     /**
      * required .Payload message = 5;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder() {
       return message_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
     }
 
     public static final int FIRSTCHUNK_FIELD_NUMBER = 6;
-    private boolean firstChunk_;
+    private boolean firstChunk_ = false;
     /**
      * optional bool firstChunk = 6;
      * @return Whether the firstChunk field is set.
      */
+    @java.lang.Override
     public boolean hasFirstChunk() {
       return ((bitField0_ & 0x00000020) != 0);
     }
@@ -6652,16 +6531,18 @@ public boolean hasFirstChunk() {
      * optional bool firstChunk = 6;
      * @return The firstChunk.
      */
+    @java.lang.Override
     public boolean getFirstChunk() {
       return firstChunk_;
     }
 
     public static final int LASTCHUNK_FIELD_NUMBER = 7;
-    private boolean lastChunk_;
+    private boolean lastChunk_ = false;
     /**
      * optional bool lastChunk = 7;
      * @return Whether the lastChunk field is set.
      */
+    @java.lang.Override
     public boolean hasLastChunk() {
       return ((bitField0_ & 0x00000040) != 0);
     }
@@ -6669,6 +6550,7 @@ public boolean hasLastChunk() {
      * optional bool lastChunk = 7;
      * @return The lastChunk.
      */
+    @java.lang.Override
     public boolean getLastChunk() {
       return lastChunk_;
     }
@@ -6732,7 +6614,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000040) != 0)) {
         output.writeBool(7, lastChunk_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -6768,7 +6650,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(7, lastChunk_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -6818,7 +6700,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getLastChunk()
             != other.getLastChunk()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -6862,7 +6744,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getLastChunk());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -6911,11 +6793,13 @@ public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -7000,24 +6884,18 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         seqNr_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         qualifier_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         ack_ = false;
-        bitField0_ = (bitField0_ & ~0x00000004);
         timestamp_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000008);
-        if (messageBuilder_ == null) {
-          message_ = null;
-        } else {
-          messageBuilder_.clear();
+        message_ = null;
+        if (messageBuilder_ != null) {
+          messageBuilder_.dispose();
+          messageBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000010);
         firstChunk_ = false;
-        bitField0_ = (bitField0_ & ~0x00000020);
         lastChunk_ = false;
-        bitField0_ = (bitField0_ & ~0x00000040);
         return this;
       }
 
@@ -7044,6 +6922,12 @@ public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Message
       @java.lang.Override
       public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent buildPartial() {
         org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent result = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -7051,9 +6935,9 @@ public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Message
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.qualifier_ = qualifier_;
           to_bitField0_ |= 0x00000002;
         }
-        result.qualifier_ = qualifier_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.ack_ = ack_;
           to_bitField0_ |= 0x00000004;
@@ -7063,11 +6947,9 @@ public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Message
           to_bitField0_ |= 0x00000008;
         }
         if (((from_bitField0_ & 0x00000010) != 0)) {
-          if (messageBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = messageBuilder_.build();
-          }
+          result.message_ = messageBuilder_ == null
+              ? message_
+              : messageBuilder_.build();
           to_bitField0_ |= 0x00000010;
         }
         if (((from_bitField0_ & 0x00000020) != 0)) {
@@ -7078,9 +6960,7 @@ public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Message
           result.lastChunk_ = lastChunk_;
           to_bitField0_ |= 0x00000040;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -7131,8 +7011,8 @@ public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.Reliab
           setSeqNr(other.getSeqNr());
         }
         if (other.hasQualifier()) {
-          bitField0_ |= 0x00000002;
           qualifier_ = other.qualifier_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasAck()) {
@@ -7150,7 +7030,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.Reliab
         if (other.hasLastChunk()) {
           setLastChunk(other.getLastChunk());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -7183,17 +7063,67 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                seqNr_ = input.readInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 18: {
+                qualifier_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 24: {
+                ack_ = input.readBool();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 32: {
+                timestamp_ = input.readInt64();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              case 42: {
+                input.readMessage(
+                    getMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 42
+              case 48: {
+                firstChunk_ = input.readBool();
+                bitField0_ |= 0x00000020;
+                break;
+              } // case 48
+              case 56: {
+                lastChunk_ = input.readBool();
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 56
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -7203,6 +7133,7 @@ public Builder mergeFrom(
        * required int64 seqNr = 1;
        * @return Whether the seqNr field is set.
        */
+      @java.lang.Override
       public boolean hasSeqNr() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -7210,6 +7141,7 @@ public boolean hasSeqNr() {
        * required int64 seqNr = 1;
        * @return The seqNr.
        */
+      @java.lang.Override
       public long getSeqNr() {
         return seqNr_;
       }
@@ -7219,8 +7151,9 @@ public long getSeqNr() {
        * @return This builder for chaining.
        */
       public Builder setSeqNr(long value) {
-        bitField0_ |= 0x00000001;
+
         seqNr_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -7285,11 +7218,9 @@ public java.lang.String getQualifier() {
        */
       public Builder setQualifier(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         qualifier_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -7298,8 +7229,8 @@ public Builder setQualifier(
        * @return This builder for chaining.
        */
       public Builder clearQualifier() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         qualifier_ = getDefaultInstance().getQualifier();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -7310,11 +7241,9 @@ public Builder clearQualifier() {
        */
       public Builder setQualifierBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         qualifier_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -7324,6 +7253,7 @@ public Builder setQualifierBytes(
        * required bool ack = 3;
        * @return Whether the ack field is set.
        */
+      @java.lang.Override
       public boolean hasAck() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -7331,6 +7261,7 @@ public boolean hasAck() {
        * required bool ack = 3;
        * @return The ack.
        */
+      @java.lang.Override
       public boolean getAck() {
         return ack_;
       }
@@ -7340,8 +7271,9 @@ public boolean getAck() {
        * @return This builder for chaining.
        */
       public Builder setAck(boolean value) {
-        bitField0_ |= 0x00000004;
+
         ack_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -7361,6 +7293,7 @@ public Builder clearAck() {
        * required int64 timestamp = 4;
        * @return Whether the timestamp field is set.
        */
+      @java.lang.Override
       public boolean hasTimestamp() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -7368,6 +7301,7 @@ public boolean hasTimestamp() {
        * required int64 timestamp = 4;
        * @return The timestamp.
        */
+      @java.lang.Override
       public long getTimestamp() {
         return timestamp_;
       }
@@ -7377,8 +7311,9 @@ public long getTimestamp() {
        * @return This builder for chaining.
        */
       public Builder setTimestamp(long value) {
-        bitField0_ |= 0x00000008;
+
         timestamp_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -7423,11 +7358,11 @@ public Builder setMessage(org.apache.pekko.remote.ContainerFormats.Payload value
             throw new NullPointerException();
           }
           message_ = value;
-          onChanged();
         } else {
           messageBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /**
@@ -7437,11 +7372,11 @@ public Builder setMessage(
           org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (messageBuilder_ == null) {
           message_ = builderForValue.build();
-          onChanged();
         } else {
           messageBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /**
@@ -7450,31 +7385,32 @@ public Builder setMessage(
       public Builder mergeMessage(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (messageBuilder_ == null) {
           if (((bitField0_ & 0x00000010) != 0) &&
-              message_ != null &&
-              message_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
-            message_ =
-              org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(message_).mergeFrom(value).buildPartial();
+            message_ != null &&
+            message_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
+            getMessageBuilder().mergeFrom(value);
           } else {
             message_ = value;
           }
-          onChanged();
         } else {
           messageBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000010;
+        if (message_ != null) {
+          bitField0_ |= 0x00000010;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Payload message = 5;
        */
       public Builder clearMessage() {
-        if (messageBuilder_ == null) {
-          message_ = null;
-          onChanged();
-        } else {
-          messageBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000010);
+        message_ = null;
+        if (messageBuilder_ != null) {
+          messageBuilder_.dispose();
+          messageBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -7518,6 +7454,7 @@ public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageOrBui
        * optional bool firstChunk = 6;
        * @return Whether the firstChunk field is set.
        */
+      @java.lang.Override
       public boolean hasFirstChunk() {
         return ((bitField0_ & 0x00000020) != 0);
       }
@@ -7525,6 +7462,7 @@ public boolean hasFirstChunk() {
        * optional bool firstChunk = 6;
        * @return The firstChunk.
        */
+      @java.lang.Override
       public boolean getFirstChunk() {
         return firstChunk_;
       }
@@ -7534,8 +7472,9 @@ public boolean getFirstChunk() {
        * @return This builder for chaining.
        */
       public Builder setFirstChunk(boolean value) {
-        bitField0_ |= 0x00000020;
+
         firstChunk_ = value;
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -7555,6 +7494,7 @@ public Builder clearFirstChunk() {
        * optional bool lastChunk = 7;
        * @return Whether the lastChunk field is set.
        */
+      @java.lang.Override
       public boolean hasLastChunk() {
         return ((bitField0_ & 0x00000040) != 0);
       }
@@ -7562,6 +7502,7 @@ public boolean hasLastChunk() {
        * optional bool lastChunk = 7;
        * @return The lastChunk.
        */
+      @java.lang.Override
       public boolean getLastChunk() {
         return lastChunk_;
       }
@@ -7571,8 +7512,9 @@ public boolean getLastChunk() {
        * @return This builder for chaining.
        */
       public Builder setLastChunk(boolean value) {
-        bitField0_ |= 0x00000040;
+
         lastChunk_ = value;
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -7619,7 +7561,18 @@ public MessageSent parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new MessageSent(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -7675,7 +7628,7 @@ public interface CleanupOrBuilder extends
    *
    * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.Cleanup}
    */
-  public  static final class Cleanup extends
+  public static final class Cleanup extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.delivery.Cleanup)
       CleanupOrBuilder {
@@ -7685,7 +7638,8 @@ private Cleanup(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder<
       super(builder);
     }
     private Cleanup() {
-      qualifiers_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      qualifiers_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -7695,61 +7649,6 @@ protected java.lang.Object newInstance(
       return new Cleanup();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Cleanup(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                qualifiers_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              qualifiers_.add(bs);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          qualifiers_ = qualifiers_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Cleanup_descriptor;
@@ -7764,7 +7663,9 @@ private Cleanup(
     }
 
     public static final int QUALIFIERS_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.LazyStringList qualifiers_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList qualifiers_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string qualifiers = 1;
      * @return A list containing the qualifiers.
@@ -7815,7 +7716,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < qualifiers_.size(); i++) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, qualifiers_.getRaw(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -7832,7 +7733,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getQualifiersList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -7849,7 +7750,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getQualifiersList()
           .equals(other.getQualifiersList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -7864,7 +7765,7 @@ public int hashCode() {
         hash = (37 * hash) + QUALIFIERS_FIELD_NUMBER;
         hash = (53 * hash) + getQualifiersList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -7913,11 +7814,13 @@ public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -7985,24 +7888,20 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        qualifiers_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = 0;
+        qualifiers_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         return this;
       }
 
@@ -8029,16 +7928,19 @@ public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup
       @java.lang.Override
       public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup buildPartial() {
         org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup result = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup(this);
-        int from_bitField0_ = bitField0_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          qualifiers_ = qualifiers_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.qualifiers_ = qualifiers_;
+        if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          qualifiers_.makeImmutable();
+          result.qualifiers_ = qualifiers_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -8086,14 +7988,14 @@ public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.Reliab
         if (!other.qualifiers_.isEmpty()) {
           if (qualifiers_.isEmpty()) {
             qualifiers_ = other.qualifiers_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ |= 0x00000001;
           } else {
             ensureQualifiersIsMutable();
             qualifiers_.addAll(other.qualifiers_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -8108,27 +8010,47 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureQualifiersIsMutable();
+                qualifiers_.add(bs);
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList qualifiers_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList qualifiers_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureQualifiersIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!qualifiers_.isModifiable()) {
           qualifiers_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(qualifiers_);
-          bitField0_ |= 0x00000001;
-         }
+        }
+        bitField0_ |= 0x00000001;
       }
       /**
        * repeated string qualifiers = 1;
@@ -8136,7 +8058,8 @@ private void ensureQualifiersIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getQualifiersList() {
-        return qualifiers_.getUnmodifiableView();
+        qualifiers_.makeImmutable();
+        return qualifiers_;
       }
       /**
        * repeated string qualifiers = 1;
@@ -8170,11 +8093,10 @@ public java.lang.String getQualifiers(int index) {
        */
       public Builder setQualifiers(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureQualifiersIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureQualifiersIsMutable();
         qualifiers_.set(index, value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8185,11 +8107,10 @@ public Builder setQualifiers(
        */
       public Builder addQualifiers(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureQualifiersIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureQualifiersIsMutable();
         qualifiers_.add(value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8203,6 +8124,7 @@ public Builder addAllQualifiers(
         ensureQualifiersIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, qualifiers_);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8211,8 +8133,9 @@ public Builder addAllQualifiers(
        * @return This builder for chaining.
        */
       public Builder clearQualifiers() {
-        qualifiers_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        qualifiers_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);;
         onChanged();
         return this;
       }
@@ -8223,11 +8146,10 @@ public Builder clearQualifiers() {
        */
       public Builder addQualifiersBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureQualifiersIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureQualifiersIsMutable();
         qualifiers_.add(value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8264,7 +8186,18 @@ public Cleanup parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Cleanup(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
diff --git a/cluster/src/main/java/org/apache/pekko/cluster/protobuf/msg/ClusterMessages.java b/cluster/src/main/java/org/apache/pekko/cluster/protobuf/msg/ClusterMessages.java
index 78b4abe1036..381f40cf600 100644
--- a/cluster/src/main/java/org/apache/pekko/cluster/protobuf/msg/ClusterMessages.java
+++ b/cluster/src/main/java/org/apache/pekko/cluster/protobuf/msg/ClusterMessages.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2020-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ClusterMessages.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.cluster.protobuf.msg;
 
 public final class ClusterMessages {
@@ -370,7 +371,7 @@ public interface JoinOrBuilder extends
    *
    * Protobuf type {@code Join}
    */
-  public  static final class Join extends
+  public static final class Join extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Join)
       JoinOrBuilder {
@@ -380,7 +381,8 @@ private Join(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
       super(builder);
     }
     private Join() {
-      roles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      roles_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       appVersion_ = "";
     }
 
@@ -391,80 +393,6 @@ protected java.lang.Object newInstance(
       return new Join();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Join(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = node_.toBuilder();
-              }
-              node_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(node_);
-                node_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                roles_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              roles_.add(bs);
-              break;
-            }
-            case 26: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              appVersion_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          roles_ = roles_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Join_descriptor;
@@ -485,6 +413,7 @@ private Join(
      * required .UniqueAddress node = 1;
      * @return Whether the node field is set.
      */
+    @java.lang.Override
     public boolean hasNode() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -492,18 +421,22 @@ public boolean hasNode() {
      * required .UniqueAddress node = 1;
      * @return The node.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getNode() {
       return node_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : node_;
     }
     /**
      * required .UniqueAddress node = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getNodeOrBuilder() {
       return node_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : node_;
     }
 
     public static final int ROLES_FIELD_NUMBER = 2;
-    private org.apache.pekko.protobufv3.internal.LazyStringList roles_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList roles_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string roles = 2;
      * @return A list containing the roles.
@@ -538,11 +471,13 @@ public java.lang.String getRoles(int index) {
     }
 
     public static final int APPVERSION_FIELD_NUMBER = 3;
-    private volatile java.lang.Object appVersion_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object appVersion_ = "";
     /**
      * optional string appVersion = 3;
      * @return Whether the appVersion field is set.
      */
+    @java.lang.Override
     public boolean hasAppVersion() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -550,6 +485,7 @@ public boolean hasAppVersion() {
      * optional string appVersion = 3;
      * @return The appVersion.
      */
+    @java.lang.Override
     public java.lang.String getAppVersion() {
       java.lang.Object ref = appVersion_;
       if (ref instanceof java.lang.String) {
@@ -568,6 +504,7 @@ public java.lang.String getAppVersion() {
      * optional string appVersion = 3;
      * @return The bytes for appVersion.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getAppVersionBytes() {
       java.lang.Object ref = appVersion_;
@@ -613,7 +550,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, appVersion_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -637,7 +574,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000002) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(3, appVersion_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -664,7 +601,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getAppVersion()
             .equals(other.getAppVersion())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -687,7 +624,7 @@ public int hashCode() {
         hash = (37 * hash) + APPVERSION_FIELD_NUMBER;
         hash = (53 * hash) + getAppVersion().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -736,11 +673,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join parseFr
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -826,16 +765,15 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (nodeBuilder_ == null) {
-          node_ = null;
-        } else {
-          nodeBuilder_.clear();
+        bitField0_ = 0;
+        node_ = null;
+        if (nodeBuilder_ != null) {
+          nodeBuilder_.dispose();
+          nodeBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        roles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        roles_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         appVersion_ = "";
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -862,28 +800,29 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join build() {
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (nodeBuilder_ == null) {
-            result.node_ = node_;
-          } else {
-            result.node_ = nodeBuilder_.build();
-          }
+          result.node_ = nodeBuilder_ == null
+              ? node_
+              : nodeBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
-        if (((bitField0_ & 0x00000002) != 0)) {
-          roles_ = roles_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000002);
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          roles_.makeImmutable();
+          result.roles_ = roles_;
         }
-        result.roles_ = roles_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.appVersion_ = appVersion_;
           to_bitField0_ |= 0x00000002;
         }
-        result.appVersion_ = appVersion_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -936,7 +875,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.J
         if (!other.roles_.isEmpty()) {
           if (roles_.isEmpty()) {
             roles_ = other.roles_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ |= 0x00000002;
           } else {
             ensureRolesIsMutable();
             roles_.addAll(other.roles_);
@@ -944,11 +883,11 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.J
           onChanged();
         }
         if (other.hasAppVersion()) {
-          bitField0_ |= 0x00000004;
           appVersion_ = other.appVersion_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -969,17 +908,48 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getNodeFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureRolesIsMutable();
+                roles_.add(bs);
+                break;
+              } // case 18
+              case 26: {
+                appVersion_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -1014,11 +984,11 @@ public Builder setNode(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Uni
             throw new NullPointerException();
           }
           node_ = value;
-          onChanged();
         } else {
           nodeBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1028,11 +998,11 @@ public Builder setNode(
           org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
         if (nodeBuilder_ == null) {
           node_ = builderForValue.build();
-          onChanged();
         } else {
           nodeBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1041,31 +1011,32 @@ public Builder setNode(
       public Builder mergeNode(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (nodeBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              node_ != null &&
-              node_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
-            node_ =
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.newBuilder(node_).mergeFrom(value).buildPartial();
+            node_ != null &&
+            node_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
+            getNodeBuilder().mergeFrom(value);
           } else {
             node_ = value;
           }
-          onChanged();
         } else {
           nodeBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (node_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .UniqueAddress node = 1;
        */
       public Builder clearNode() {
-        if (nodeBuilder_ == null) {
-          node_ = null;
-          onChanged();
-        } else {
-          nodeBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        node_ = null;
+        if (nodeBuilder_ != null) {
+          nodeBuilder_.dispose();
+          nodeBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -1104,12 +1075,13 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuil
         return nodeBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList roles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList roles_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureRolesIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!roles_.isModifiable()) {
           roles_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(roles_);
-          bitField0_ |= 0x00000002;
-         }
+        }
+        bitField0_ |= 0x00000002;
       }
       /**
        * repeated string roles = 2;
@@ -1117,7 +1089,8 @@ private void ensureRolesIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getRolesList() {
-        return roles_.getUnmodifiableView();
+        roles_.makeImmutable();
+        return roles_;
       }
       /**
        * repeated string roles = 2;
@@ -1151,11 +1124,10 @@ public java.lang.String getRoles(int index) {
        */
       public Builder setRoles(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureRolesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureRolesIsMutable();
         roles_.set(index, value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1166,11 +1138,10 @@ public Builder setRoles(
        */
       public Builder addRoles(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureRolesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureRolesIsMutable();
         roles_.add(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1184,6 +1155,7 @@ public Builder addAllRoles(
         ensureRolesIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, roles_);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1192,8 +1164,9 @@ public Builder addAllRoles(
        * @return This builder for chaining.
        */
       public Builder clearRoles() {
-        roles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        roles_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);;
         onChanged();
         return this;
       }
@@ -1204,11 +1177,10 @@ public Builder clearRoles() {
        */
       public Builder addRolesBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureRolesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureRolesIsMutable();
         roles_.add(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1263,11 +1235,9 @@ public java.lang.String getAppVersion() {
        */
       public Builder setAppVersion(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         appVersion_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1276,8 +1246,8 @@ public Builder setAppVersion(
        * @return This builder for chaining.
        */
       public Builder clearAppVersion() {
-        bitField0_ = (bitField0_ & ~0x00000004);
         appVersion_ = getDefaultInstance().getAppVersion();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -1288,11 +1258,9 @@ public Builder clearAppVersion() {
        */
       public Builder setAppVersionBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         appVersion_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1329,7 +1297,18 @@ public Join parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Join(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -1391,7 +1370,7 @@ public interface WelcomeOrBuilder extends
    *
    * Protobuf type {@code Welcome}
    */
-  public  static final class Welcome extends
+  public static final class Welcome extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Welcome)
       WelcomeOrBuilder {
@@ -1410,75 +1389,6 @@ protected java.lang.Object newInstance(
       return new Welcome();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Welcome(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = from_.toBuilder();
-              }
-              from_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(from_);
-                from_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = gossip_.toBuilder();
-              }
-              gossip_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(gossip_);
-                gossip_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Welcome_descriptor;
@@ -1499,6 +1409,7 @@ private Welcome(
      * required .UniqueAddress from = 1;
      * @return Whether the from field is set.
      */
+    @java.lang.Override
     public boolean hasFrom() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -1506,12 +1417,14 @@ public boolean hasFrom() {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom() {
       return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
     }
     /**
      * required .UniqueAddress from = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder() {
       return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
     }
@@ -1522,6 +1435,7 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuil
      * required .Gossip gossip = 2;
      * @return Whether the gossip field is set.
      */
+    @java.lang.Override
     public boolean hasGossip() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -1529,12 +1443,14 @@ public boolean hasGossip() {
      * required .Gossip gossip = 2;
      * @return The gossip.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip getGossip() {
       return gossip_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.getDefaultInstance() : gossip_;
     }
     /**
      * required .Gossip gossip = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOrBuilder getGossipOrBuilder() {
       return gossip_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.getDefaultInstance() : gossip_;
     }
@@ -1575,7 +1491,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getGossip());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -1592,7 +1508,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getGossip());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1617,7 +1533,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getGossip()
             .equals(other.getGossip())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1636,7 +1552,7 @@ public int hashCode() {
         hash = (37 * hash) + GOSSIP_FIELD_NUMBER;
         hash = (53 * hash) + getGossip().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1685,11 +1601,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome pars
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -1776,18 +1694,17 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (fromBuilder_ == null) {
-          from_ = null;
-        } else {
-          fromBuilder_.clear();
+        bitField0_ = 0;
+        from_ = null;
+        if (fromBuilder_ != null) {
+          fromBuilder_.dispose();
+          fromBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (gossipBuilder_ == null) {
-          gossip_ = null;
-        } else {
-          gossipBuilder_.clear();
+        gossip_ = null;
+        if (gossipBuilder_ != null) {
+          gossipBuilder_.dispose();
+          gossipBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -1814,27 +1731,27 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome build() {
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (fromBuilder_ == null) {
-            result.from_ = from_;
-          } else {
-            result.from_ = fromBuilder_.build();
-          }
+          result.from_ = fromBuilder_ == null
+              ? from_
+              : fromBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (gossipBuilder_ == null) {
-            result.gossip_ = gossip_;
-          } else {
-            result.gossip_ = gossipBuilder_.build();
-          }
+          result.gossip_ = gossipBuilder_ == null
+              ? gossip_
+              : gossipBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1887,7 +1804,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.W
         if (other.hasGossip()) {
           mergeGossip(other.getGossip());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1914,17 +1831,44 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getFromFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getGossipFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -1959,11 +1903,11 @@ public Builder setFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Uni
             throw new NullPointerException();
           }
           from_ = value;
-          onChanged();
         } else {
           fromBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1973,11 +1917,11 @@ public Builder setFrom(
           org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
-          onChanged();
         } else {
           fromBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1986,31 +1930,32 @@ public Builder setFrom(
       public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              from_ != null &&
-              from_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
-            from_ =
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
+            from_ != null &&
+            from_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
+            getFromBuilder().mergeFrom(value);
           } else {
             from_ = value;
           }
-          onChanged();
         } else {
           fromBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (from_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .UniqueAddress from = 1;
        */
       public Builder clearFrom() {
-        if (fromBuilder_ == null) {
-          from_ = null;
-          onChanged();
-        } else {
-          fromBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        from_ = null;
+        if (fromBuilder_ != null) {
+          fromBuilder_.dispose();
+          fromBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -2079,11 +2024,11 @@ public Builder setGossip(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.G
             throw new NullPointerException();
           }
           gossip_ = value;
-          onChanged();
         } else {
           gossipBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -2093,11 +2038,11 @@ public Builder setGossip(
           org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.Builder builderForValue) {
         if (gossipBuilder_ == null) {
           gossip_ = builderForValue.build();
-          onChanged();
         } else {
           gossipBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -2106,31 +2051,32 @@ public Builder setGossip(
       public Builder mergeGossip(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip value) {
         if (gossipBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              gossip_ != null &&
-              gossip_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.getDefaultInstance()) {
-            gossip_ =
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.newBuilder(gossip_).mergeFrom(value).buildPartial();
+            gossip_ != null &&
+            gossip_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.getDefaultInstance()) {
+            getGossipBuilder().mergeFrom(value);
           } else {
             gossip_ = value;
           }
-          onChanged();
         } else {
           gossipBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (gossip_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Gossip gossip = 2;
        */
       public Builder clearGossip() {
-        if (gossipBuilder_ == null) {
-          gossip_ = null;
-          onChanged();
-        } else {
-          gossipBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        gossip_ = null;
+        if (gossipBuilder_ != null) {
+          gossipBuilder_.dispose();
+          gossipBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -2201,7 +2147,18 @@ public Welcome parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Welcome(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -2250,7 +2207,7 @@ public interface InitJoinOrBuilder extends
    *
    * Protobuf type {@code InitJoin}
    */
-  public  static final class InitJoin extends
+  public static final class InitJoin extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:InitJoin)
       InitJoinOrBuilder {
@@ -2270,55 +2227,6 @@ protected java.lang.Object newInstance(
       return new InitJoin();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private InitJoin(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              currentConfig_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoin_descriptor;
@@ -2334,11 +2242,13 @@ private InitJoin(
 
     private int bitField0_;
     public static final int CURRENTCONFIG_FIELD_NUMBER = 1;
-    private volatile java.lang.Object currentConfig_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object currentConfig_ = "";
     /**
      * optional string currentConfig = 1;
      * @return Whether the currentConfig field is set.
      */
+    @java.lang.Override
     public boolean hasCurrentConfig() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -2346,6 +2256,7 @@ public boolean hasCurrentConfig() {
      * optional string currentConfig = 1;
      * @return The currentConfig.
      */
+    @java.lang.Override
     public java.lang.String getCurrentConfig() {
       java.lang.Object ref = currentConfig_;
       if (ref instanceof java.lang.String) {
@@ -2364,6 +2275,7 @@ public java.lang.String getCurrentConfig() {
      * optional string currentConfig = 1;
      * @return The bytes for currentConfig.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getCurrentConfigBytes() {
       java.lang.Object ref = currentConfig_;
@@ -2395,7 +2307,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, currentConfig_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -2407,7 +2319,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000001) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, currentConfig_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2427,7 +2339,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getCurrentConfig()
             .equals(other.getCurrentConfig())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -2442,7 +2354,7 @@ public int hashCode() {
         hash = (37 * hash) + CURRENTCONFIG_FIELD_NUMBER;
         hash = (53 * hash) + getCurrentConfig().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -2491,11 +2403,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin par
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -2564,24 +2478,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         currentConfig_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -2608,15 +2517,19 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin build() {
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.currentConfig_ = currentConfig_;
           to_bitField0_ |= 0x00000001;
         }
-        result.currentConfig_ = currentConfig_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -2664,11 +2577,11 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin other) {
         if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin.getDefaultInstance()) return this;
         if (other.hasCurrentConfig()) {
-          bitField0_ |= 0x00000001;
           currentConfig_ = other.currentConfig_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -2683,17 +2596,35 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                currentConfig_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -2748,11 +2679,9 @@ public java.lang.String getCurrentConfig() {
        */
       public Builder setCurrentConfig(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         currentConfig_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2761,8 +2690,8 @@ public Builder setCurrentConfig(
        * @return This builder for chaining.
        */
       public Builder clearCurrentConfig() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         currentConfig_ = getDefaultInstance().getCurrentConfig();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -2773,11 +2702,9 @@ public Builder clearCurrentConfig() {
        */
       public Builder setCurrentConfigBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         currentConfig_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2814,7 +2741,18 @@ public InitJoin parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new InitJoin(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -2876,7 +2814,7 @@ public interface InitJoinAckOrBuilder extends
    *
    * Protobuf type {@code InitJoinAck}
    */
-  public  static final class InitJoinAck extends
+  public static final class InitJoinAck extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:InitJoinAck)
       InitJoinAckOrBuilder {
@@ -2895,75 +2833,6 @@ protected java.lang.Object newInstance(
       return new InitJoinAck();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private InitJoinAck(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = address_.toBuilder();
-              }
-              address_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(address_);
-                address_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = configCheck_.toBuilder();
-              }
-              configCheck_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(configCheck_);
-                configCheck_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoinAck_descriptor;
@@ -2984,6 +2853,7 @@ private InitJoinAck(
      * required .Address address = 1;
      * @return Whether the address field is set.
      */
+    @java.lang.Override
     public boolean hasAddress() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -2991,12 +2861,14 @@ public boolean hasAddress() {
      * required .Address address = 1;
      * @return The address.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address getAddress() {
       return address_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : address_;
     }
     /**
      * required .Address address = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getAddressOrBuilder() {
       return address_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : address_;
     }
@@ -3007,6 +2879,7 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder ge
      * required .ConfigCheck configCheck = 2;
      * @return Whether the configCheck field is set.
      */
+    @java.lang.Override
     public boolean hasConfigCheck() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -3014,12 +2887,14 @@ public boolean hasConfigCheck() {
      * required .ConfigCheck configCheck = 2;
      * @return The configCheck.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck getConfigCheck() {
       return configCheck_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.getDefaultInstance() : configCheck_;
     }
     /**
      * required .ConfigCheck configCheck = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheckOrBuilder getConfigCheckOrBuilder() {
       return configCheck_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.getDefaultInstance() : configCheck_;
     }
@@ -3060,7 +2935,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getConfigCheck());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -3077,7 +2952,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getConfigCheck());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -3102,7 +2977,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getConfigCheck()
             .equals(other.getConfigCheck())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -3121,7 +2996,7 @@ public int hashCode() {
         hash = (37 * hash) + CONFIGCHECK_FIELD_NUMBER;
         hash = (53 * hash) + getConfigCheck().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3170,11 +3045,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -3261,18 +3138,17 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (addressBuilder_ == null) {
-          address_ = null;
-        } else {
-          addressBuilder_.clear();
+        bitField0_ = 0;
+        address_ = null;
+        if (addressBuilder_ != null) {
+          addressBuilder_.dispose();
+          addressBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (configCheckBuilder_ == null) {
-          configCheck_ = null;
-        } else {
-          configCheckBuilder_.clear();
+        configCheck_ = null;
+        if (configCheckBuilder_ != null) {
+          configCheckBuilder_.dispose();
+          configCheckBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -3299,27 +3175,27 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck build()
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (addressBuilder_ == null) {
-            result.address_ = address_;
-          } else {
-            result.address_ = addressBuilder_.build();
-          }
+          result.address_ = addressBuilder_ == null
+              ? address_
+              : addressBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (configCheckBuilder_ == null) {
-            result.configCheck_ = configCheck_;
-          } else {
-            result.configCheck_ = configCheckBuilder_.build();
-          }
+          result.configCheck_ = configCheckBuilder_ == null
+              ? configCheck_
+              : configCheckBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -3372,7 +3248,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.I
         if (other.hasConfigCheck()) {
           mergeConfigCheck(other.getConfigCheck());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -3399,17 +3275,44 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getAddressFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getConfigCheckFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -3444,11 +3347,11 @@ public Builder setAddress(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.
             throw new NullPointerException();
           }
           address_ = value;
-          onChanged();
         } else {
           addressBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -3458,11 +3361,11 @@ public Builder setAddress(
           org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder builderForValue) {
         if (addressBuilder_ == null) {
           address_ = builderForValue.build();
-          onChanged();
         } else {
           addressBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -3471,31 +3374,32 @@ public Builder setAddress(
       public Builder mergeAddress(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address value) {
         if (addressBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              address_ != null &&
-              address_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance()) {
-            address_ =
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.newBuilder(address_).mergeFrom(value).buildPartial();
+            address_ != null &&
+            address_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance()) {
+            getAddressBuilder().mergeFrom(value);
           } else {
             address_ = value;
           }
-          onChanged();
         } else {
           addressBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (address_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Address address = 1;
        */
       public Builder clearAddress() {
-        if (addressBuilder_ == null) {
-          address_ = null;
-          onChanged();
-        } else {
-          addressBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        address_ = null;
+        if (addressBuilder_ != null) {
+          addressBuilder_.dispose();
+          addressBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -3564,11 +3468,11 @@ public Builder setConfigCheck(org.apache.pekko.cluster.protobuf.msg.ClusterMessa
             throw new NullPointerException();
           }
           configCheck_ = value;
-          onChanged();
         } else {
           configCheckBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -3578,11 +3482,11 @@ public Builder setConfigCheck(
           org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Builder builderForValue) {
         if (configCheckBuilder_ == null) {
           configCheck_ = builderForValue.build();
-          onChanged();
         } else {
           configCheckBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -3591,31 +3495,32 @@ public Builder setConfigCheck(
       public Builder mergeConfigCheck(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck value) {
         if (configCheckBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              configCheck_ != null &&
-              configCheck_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.getDefaultInstance()) {
-            configCheck_ =
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.newBuilder(configCheck_).mergeFrom(value).buildPartial();
+            configCheck_ != null &&
+            configCheck_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.getDefaultInstance()) {
+            getConfigCheckBuilder().mergeFrom(value);
           } else {
             configCheck_ = value;
           }
-          onChanged();
         } else {
           configCheckBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (configCheck_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .ConfigCheck configCheck = 2;
        */
       public Builder clearConfigCheck() {
-        if (configCheckBuilder_ == null) {
-          configCheck_ = null;
-          onChanged();
-        } else {
-          configCheckBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        configCheck_ = null;
+        if (configCheckBuilder_ != null) {
+          configCheckBuilder_.dispose();
+          configCheckBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -3686,7 +3591,18 @@ public InitJoinAck parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new InitJoinAck(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -3741,7 +3657,7 @@ public interface ConfigCheckOrBuilder extends
   /**
    * Protobuf type {@code ConfigCheck}
    */
-  public  static final class ConfigCheck extends
+  public static final class ConfigCheck extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ConfigCheck)
       ConfigCheckOrBuilder {
@@ -3762,67 +3678,6 @@ protected java.lang.Object newInstance(
       return new ConfigCheck();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ConfigCheck(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              int rawValue = input.readEnum();
-                @SuppressWarnings("deprecation")
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type value = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(1, rawValue);
-              } else {
-                bitField0_ |= 0x00000001;
-                type_ = rawValue;
-              }
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              clusterConfig_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ConfigCheck_descriptor;
@@ -3943,30 +3798,31 @@ private Type(int value) {
 
     private int bitField0_;
     public static final int TYPE_FIELD_NUMBER = 1;
-    private int type_;
+    private int type_ = 1;
     /**
      * required .ConfigCheck.Type type = 1;
      * @return Whether the type field is set.
      */
-    public boolean hasType() {
+    @java.lang.Override public boolean hasType() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      * required .ConfigCheck.Type type = 1;
      * @return The type.
      */
-    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type getType() {
-      @SuppressWarnings("deprecation")
-      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type result = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type.valueOf(type_);
+    @java.lang.Override public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type getType() {
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type result = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type.forNumber(type_);
       return result == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type.UncheckedConfig : result;
     }
 
     public static final int CLUSTERCONFIG_FIELD_NUMBER = 2;
-    private volatile java.lang.Object clusterConfig_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object clusterConfig_ = "";
     /**
      * optional string clusterConfig = 2;
      * @return Whether the clusterConfig field is set.
      */
+    @java.lang.Override
     public boolean hasClusterConfig() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -3974,6 +3830,7 @@ public boolean hasClusterConfig() {
      * optional string clusterConfig = 2;
      * @return The clusterConfig.
      */
+    @java.lang.Override
     public java.lang.String getClusterConfig() {
       java.lang.Object ref = clusterConfig_;
       if (ref instanceof java.lang.String) {
@@ -3992,6 +3849,7 @@ public java.lang.String getClusterConfig() {
      * optional string clusterConfig = 2;
      * @return The bytes for clusterConfig.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getClusterConfigBytes() {
       java.lang.Object ref = clusterConfig_;
@@ -4030,7 +3888,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, clusterConfig_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -4046,7 +3904,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000002) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, clusterConfig_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4070,7 +3928,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getClusterConfig()
             .equals(other.getClusterConfig())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -4089,7 +3947,7 @@ public int hashCode() {
         hash = (37 * hash) + CLUSTERCONFIG_FIELD_NUMBER;
         hash = (53 * hash) + getClusterConfig().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4138,11 +3996,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -4206,26 +4066,20 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         type_ = 1;
-        bitField0_ = (bitField0_ & ~0x00000001);
         clusterConfig_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -4252,19 +4106,23 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck build()
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.type_ = type_;
           to_bitField0_ |= 0x00000001;
         }
-        result.type_ = type_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.clusterConfig_ = clusterConfig_;
           to_bitField0_ |= 0x00000002;
         }
-        result.clusterConfig_ = clusterConfig_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -4315,11 +4173,11 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.C
           setType(other.getType());
         }
         if (other.hasClusterConfig()) {
-          bitField0_ |= 0x00000002;
           clusterConfig_ = other.clusterConfig_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -4337,17 +4195,47 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                int tmpRaw = input.readEnum();
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type tmpValue =
+                    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(1, tmpRaw);
+                } else {
+                  type_ = tmpRaw;
+                  bitField0_ |= 0x00000001;
+                }
+                break;
+              } // case 8
+              case 18: {
+                clusterConfig_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -4357,16 +4245,16 @@ public Builder mergeFrom(
        * required .ConfigCheck.Type type = 1;
        * @return Whether the type field is set.
        */
-      public boolean hasType() {
+      @java.lang.Override public boolean hasType() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        * required .ConfigCheck.Type type = 1;
        * @return The type.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type getType() {
-        @SuppressWarnings("deprecation")
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type result = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type.valueOf(type_);
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type result = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type.forNumber(type_);
         return result == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type.UncheckedConfig : result;
       }
       /**
@@ -4444,11 +4332,9 @@ public java.lang.String getClusterConfig() {
        */
       public Builder setClusterConfig(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         clusterConfig_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4457,8 +4343,8 @@ public Builder setClusterConfig(
        * @return This builder for chaining.
        */
       public Builder clearClusterConfig() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         clusterConfig_ = getDefaultInstance().getClusterConfig();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -4469,11 +4355,9 @@ public Builder clearClusterConfig() {
        */
       public Builder setClusterConfigBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         clusterConfig_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4510,7 +4394,18 @@ public ConfigCheck parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ConfigCheck(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -4581,7 +4476,7 @@ public interface HeartbeatOrBuilder extends
    *
    * Protobuf type {@code Heartbeat}
    */
-  public  static final class Heartbeat extends
+  public static final class Heartbeat extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Heartbeat)
       HeartbeatOrBuilder {
@@ -4600,72 +4495,6 @@ protected java.lang.Object newInstance(
       return new Heartbeat();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Heartbeat(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = from_.toBuilder();
-              }
-              from_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(from_);
-                from_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              sequenceNr_ = input.readInt64();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              creationTime_ = input.readSInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Heartbeat_descriptor;
@@ -4686,6 +4515,7 @@ private Heartbeat(
      * required .Address from = 1;
      * @return Whether the from field is set.
      */
+    @java.lang.Override
     public boolean hasFrom() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -4693,22 +4523,25 @@ public boolean hasFrom() {
      * required .Address from = 1;
      * @return The from.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address getFrom() {
       return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : from_;
     }
     /**
      * required .Address from = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getFromOrBuilder() {
       return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : from_;
     }
 
     public static final int SEQUENCENR_FIELD_NUMBER = 2;
-    private long sequenceNr_;
+    private long sequenceNr_ = 0L;
     /**
      * optional int64 sequenceNr = 2;
      * @return Whether the sequenceNr field is set.
      */
+    @java.lang.Override
     public boolean hasSequenceNr() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -4716,16 +4549,18 @@ public boolean hasSequenceNr() {
      * optional int64 sequenceNr = 2;
      * @return The sequenceNr.
      */
+    @java.lang.Override
     public long getSequenceNr() {
       return sequenceNr_;
     }
 
     public static final int CREATIONTIME_FIELD_NUMBER = 3;
-    private long creationTime_;
+    private long creationTime_ = 0L;
     /**
      * optional sint64 creationTime = 3;
      * @return Whether the creationTime field is set.
      */
+    @java.lang.Override
     public boolean hasCreationTime() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -4733,6 +4568,7 @@ public boolean hasCreationTime() {
      * optional sint64 creationTime = 3;
      * @return The creationTime.
      */
+    @java.lang.Override
     public long getCreationTime() {
       return creationTime_;
     }
@@ -4768,7 +4604,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeSInt64(3, creationTime_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -4789,7 +4625,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeSInt64Size(3, creationTime_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4819,7 +4655,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getCreationTime()
             != other.getCreationTime()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -4844,7 +4680,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getCreationTime());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4893,11 +4729,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat pa
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -4985,16 +4823,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (fromBuilder_ == null) {
-          from_ = null;
-        } else {
-          fromBuilder_.clear();
+        bitField0_ = 0;
+        from_ = null;
+        if (fromBuilder_ != null) {
+          fromBuilder_.dispose();
+          fromBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         sequenceNr_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
         creationTime_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -5021,14 +4857,18 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat build() {
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (fromBuilder_ == null) {
-            result.from_ = from_;
-          } else {
-            result.from_ = fromBuilder_.build();
-          }
+          result.from_ = fromBuilder_ == null
+              ? from_
+              : fromBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
@@ -5039,9 +4879,7 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat buildPart
           result.creationTime_ = creationTime_;
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -5097,7 +4935,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.H
         if (other.hasCreationTime()) {
           setCreationTime(other.getCreationTime());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -5118,17 +4956,47 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getFromFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                sequenceNr_ = input.readInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                creationTime_ = input.readSInt64();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
+        } finally {
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -5163,11 +5031,11 @@ public Builder setFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Add
             throw new NullPointerException();
           }
           from_ = value;
-          onChanged();
         } else {
           fromBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -5177,11 +5045,11 @@ public Builder setFrom(
           org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
-          onChanged();
         } else {
           fromBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -5190,31 +5058,32 @@ public Builder setFrom(
       public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              from_ != null &&
-              from_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance()) {
-            from_ =
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.newBuilder(from_).mergeFrom(value).buildPartial();
+            from_ != null &&
+            from_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance()) {
+            getFromBuilder().mergeFrom(value);
           } else {
             from_ = value;
           }
-          onChanged();
         } else {
           fromBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (from_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Address from = 1;
        */
       public Builder clearFrom() {
-        if (fromBuilder_ == null) {
-          from_ = null;
-          onChanged();
-        } else {
-          fromBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        from_ = null;
+        if (fromBuilder_ != null) {
+          fromBuilder_.dispose();
+          fromBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -5258,6 +5127,7 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder ge
        * optional int64 sequenceNr = 2;
        * @return Whether the sequenceNr field is set.
        */
+      @java.lang.Override
       public boolean hasSequenceNr() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -5265,6 +5135,7 @@ public boolean hasSequenceNr() {
        * optional int64 sequenceNr = 2;
        * @return The sequenceNr.
        */
+      @java.lang.Override
       public long getSequenceNr() {
         return sequenceNr_;
       }
@@ -5274,8 +5145,9 @@ public long getSequenceNr() {
        * @return This builder for chaining.
        */
       public Builder setSequenceNr(long value) {
-        bitField0_ |= 0x00000002;
+
         sequenceNr_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -5295,6 +5167,7 @@ public Builder clearSequenceNr() {
        * optional sint64 creationTime = 3;
        * @return Whether the creationTime field is set.
        */
+      @java.lang.Override
       public boolean hasCreationTime() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -5302,6 +5175,7 @@ public boolean hasCreationTime() {
        * optional sint64 creationTime = 3;
        * @return The creationTime.
        */
+      @java.lang.Override
       public long getCreationTime() {
         return creationTime_;
       }
@@ -5311,8 +5185,9 @@ public long getCreationTime() {
        * @return This builder for chaining.
        */
       public Builder setCreationTime(long value) {
-        bitField0_ |= 0x00000004;
+
         creationTime_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -5359,7 +5234,18 @@ public Heartbeat parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Heartbeat(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -5430,7 +5316,7 @@ public interface HeartBeatResponseOrBuilder extends
    *
    * Protobuf type {@code HeartBeatResponse}
    */
-  public  static final class HeartBeatResponse extends
+  public static final class HeartBeatResponse extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:HeartBeatResponse)
       HeartBeatResponseOrBuilder {
@@ -5449,72 +5335,6 @@ protected java.lang.Object newInstance(
       return new HeartBeatResponse();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private HeartBeatResponse(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = from_.toBuilder();
-              }
-              from_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(from_);
-                from_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              sequenceNr_ = input.readInt64();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              creationTime_ = input.readInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_HeartBeatResponse_descriptor;
@@ -5535,6 +5355,7 @@ private HeartBeatResponse(
      * required .UniqueAddress from = 1;
      * @return Whether the from field is set.
      */
+    @java.lang.Override
     public boolean hasFrom() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -5542,22 +5363,25 @@ public boolean hasFrom() {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom() {
       return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
     }
     /**
      * required .UniqueAddress from = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder() {
       return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
     }
 
     public static final int SEQUENCENR_FIELD_NUMBER = 2;
-    private long sequenceNr_;
+    private long sequenceNr_ = 0L;
     /**
      * optional int64 sequenceNr = 2;
      * @return Whether the sequenceNr field is set.
      */
+    @java.lang.Override
     public boolean hasSequenceNr() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -5565,16 +5389,18 @@ public boolean hasSequenceNr() {
      * optional int64 sequenceNr = 2;
      * @return The sequenceNr.
      */
+    @java.lang.Override
     public long getSequenceNr() {
       return sequenceNr_;
     }
 
     public static final int CREATIONTIME_FIELD_NUMBER = 3;
-    private long creationTime_;
+    private long creationTime_ = 0L;
     /**
      * optional int64 creationTime = 3;
      * @return Whether the creationTime field is set.
      */
+    @java.lang.Override
     public boolean hasCreationTime() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -5582,6 +5408,7 @@ public boolean hasCreationTime() {
      * optional int64 creationTime = 3;
      * @return The creationTime.
      */
+    @java.lang.Override
     public long getCreationTime() {
       return creationTime_;
     }
@@ -5617,7 +5444,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeInt64(3, creationTime_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -5638,7 +5465,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(3, creationTime_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5668,7 +5495,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getCreationTime()
             != other.getCreationTime()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -5693,7 +5520,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getCreationTime());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -5742,11 +5569,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatRes
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -5834,16 +5663,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (fromBuilder_ == null) {
-          from_ = null;
-        } else {
-          fromBuilder_.clear();
+        bitField0_ = 0;
+        from_ = null;
+        if (fromBuilder_ != null) {
+          fromBuilder_.dispose();
+          fromBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         sequenceNr_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
         creationTime_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -5870,14 +5697,18 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse b
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (fromBuilder_ == null) {
-            result.from_ = from_;
-          } else {
-            result.from_ = fromBuilder_.build();
-          }
+          result.from_ = fromBuilder_ == null
+              ? from_
+              : fromBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
@@ -5888,9 +5719,7 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse b
           result.creationTime_ = creationTime_;
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -5946,7 +5775,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.H
         if (other.hasCreationTime()) {
           setCreationTime(other.getCreationTime());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -5967,17 +5796,47 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getFromFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                sequenceNr_ = input.readInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                creationTime_ = input.readInt64();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -6012,11 +5871,11 @@ public Builder setFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Uni
             throw new NullPointerException();
           }
           from_ = value;
-          onChanged();
         } else {
           fromBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -6026,11 +5885,11 @@ public Builder setFrom(
           org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
-          onChanged();
         } else {
           fromBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -6039,31 +5898,32 @@ public Builder setFrom(
       public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              from_ != null &&
-              from_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
-            from_ =
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
+            from_ != null &&
+            from_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
+            getFromBuilder().mergeFrom(value);
           } else {
             from_ = value;
           }
-          onChanged();
         } else {
           fromBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (from_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .UniqueAddress from = 1;
        */
       public Builder clearFrom() {
-        if (fromBuilder_ == null) {
-          from_ = null;
-          onChanged();
-        } else {
-          fromBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        from_ = null;
+        if (fromBuilder_ != null) {
+          fromBuilder_.dispose();
+          fromBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -6107,6 +5967,7 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuil
        * optional int64 sequenceNr = 2;
        * @return Whether the sequenceNr field is set.
        */
+      @java.lang.Override
       public boolean hasSequenceNr() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -6114,6 +5975,7 @@ public boolean hasSequenceNr() {
        * optional int64 sequenceNr = 2;
        * @return The sequenceNr.
        */
+      @java.lang.Override
       public long getSequenceNr() {
         return sequenceNr_;
       }
@@ -6123,8 +5985,9 @@ public long getSequenceNr() {
        * @return This builder for chaining.
        */
       public Builder setSequenceNr(long value) {
-        bitField0_ |= 0x00000002;
+
         sequenceNr_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -6144,6 +6007,7 @@ public Builder clearSequenceNr() {
        * optional int64 creationTime = 3;
        * @return Whether the creationTime field is set.
        */
+      @java.lang.Override
       public boolean hasCreationTime() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -6151,6 +6015,7 @@ public boolean hasCreationTime() {
        * optional int64 creationTime = 3;
        * @return The creationTime.
        */
+      @java.lang.Override
       public long getCreationTime() {
         return creationTime_;
       }
@@ -6160,8 +6025,9 @@ public long getCreationTime() {
        * @return This builder for chaining.
        */
       public Builder setCreationTime(long value) {
-        bitField0_ |= 0x00000004;
+
         creationTime_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -6208,7 +6074,18 @@ public HeartBeatResponse parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new HeartBeatResponse(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -6281,7 +6158,7 @@ public interface GossipEnvelopeOrBuilder extends
    *
    * Protobuf type {@code GossipEnvelope}
    */
-  public  static final class GossipEnvelope extends
+  public static final class GossipEnvelope extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:GossipEnvelope)
       GossipEnvelopeOrBuilder {
@@ -6301,80 +6178,6 @@ protected java.lang.Object newInstance(
       return new GossipEnvelope();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private GossipEnvelope(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = from_.toBuilder();
-              }
-              from_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(from_);
-                from_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = to_.toBuilder();
-              }
-              to_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(to_);
-                to_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            case 26: {
-              bitField0_ |= 0x00000004;
-              serializedGossip_ = input.readBytes();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_GossipEnvelope_descriptor;
@@ -6395,6 +6198,7 @@ private GossipEnvelope(
      * required .UniqueAddress from = 1;
      * @return Whether the from field is set.
      */
+    @java.lang.Override
     public boolean hasFrom() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -6402,12 +6206,14 @@ public boolean hasFrom() {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom() {
       return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
     }
     /**
      * required .UniqueAddress from = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder() {
       return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
     }
@@ -6418,6 +6224,7 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuil
      * required .UniqueAddress to = 2;
      * @return Whether the to field is set.
      */
+    @java.lang.Override
     public boolean hasTo() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -6425,22 +6232,25 @@ public boolean hasTo() {
      * required .UniqueAddress to = 2;
      * @return The to.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getTo() {
       return to_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : to_;
     }
     /**
      * required .UniqueAddress to = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getToOrBuilder() {
       return to_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : to_;
     }
 
     public static final int SERIALIZEDGOSSIP_FIELD_NUMBER = 3;
-    private org.apache.pekko.protobufv3.internal.ByteString serializedGossip_;
+    private org.apache.pekko.protobufv3.internal.ByteString serializedGossip_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * required bytes serializedGossip = 3;
      * @return Whether the serializedGossip field is set.
      */
+    @java.lang.Override
     public boolean hasSerializedGossip() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -6448,6 +6258,7 @@ public boolean hasSerializedGossip() {
      * required bytes serializedGossip = 3;
      * @return The serializedGossip.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getSerializedGossip() {
       return serializedGossip_;
     }
@@ -6495,7 +6306,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeBytes(3, serializedGossip_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -6516,7 +6327,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(3, serializedGossip_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -6546,7 +6357,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getSerializedGossip()
             .equals(other.getSerializedGossip())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -6569,7 +6380,7 @@ public int hashCode() {
         hash = (37 * hash) + SERIALIZEDGOSSIP_FIELD_NUMBER;
         hash = (53 * hash) + getSerializedGossip().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -6618,11 +6429,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelo
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -6709,20 +6522,18 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (fromBuilder_ == null) {
-          from_ = null;
-        } else {
-          fromBuilder_.clear();
+        bitField0_ = 0;
+        from_ = null;
+        if (fromBuilder_ != null) {
+          fromBuilder_.dispose();
+          fromBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (toBuilder_ == null) {
-          to_ = null;
-        } else {
-          toBuilder_.clear();
+        to_ = null;
+        if (toBuilder_ != null) {
+          toBuilder_.dispose();
+          toBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         serializedGossip_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -6749,31 +6560,31 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope buil
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (fromBuilder_ == null) {
-            result.from_ = from_;
-          } else {
-            result.from_ = fromBuilder_.build();
-          }
+          result.from_ = fromBuilder_ == null
+              ? from_
+              : fromBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (toBuilder_ == null) {
-            result.to_ = to_;
-          } else {
-            result.to_ = toBuilder_.build();
-          }
+          result.to_ = toBuilder_ == null
+              ? to_
+              : toBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.serializedGossip_ = serializedGossip_;
           to_bitField0_ |= 0x00000004;
         }
-        result.serializedGossip_ = serializedGossip_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -6829,7 +6640,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.G
         if (other.hasSerializedGossip()) {
           setSerializedGossip(other.getSerializedGossip());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -6859,17 +6670,49 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getFromFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getToFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 26: {
+                serializedGossip_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -6904,11 +6747,11 @@ public Builder setFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Uni
             throw new NullPointerException();
           }
           from_ = value;
-          onChanged();
         } else {
           fromBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -6918,11 +6761,11 @@ public Builder setFrom(
           org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
-          onChanged();
         } else {
           fromBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -6931,31 +6774,32 @@ public Builder setFrom(
       public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              from_ != null &&
-              from_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
-            from_ =
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
+            from_ != null &&
+            from_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
+            getFromBuilder().mergeFrom(value);
           } else {
             from_ = value;
           }
-          onChanged();
         } else {
           fromBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (from_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .UniqueAddress from = 1;
        */
       public Builder clearFrom() {
-        if (fromBuilder_ == null) {
-          from_ = null;
-          onChanged();
-        } else {
-          fromBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        from_ = null;
+        if (fromBuilder_ != null) {
+          fromBuilder_.dispose();
+          fromBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -7024,11 +6868,11 @@ public Builder setTo(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Uniqu
             throw new NullPointerException();
           }
           to_ = value;
-          onChanged();
         } else {
           toBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -7038,11 +6882,11 @@ public Builder setTo(
           org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
         if (toBuilder_ == null) {
           to_ = builderForValue.build();
-          onChanged();
         } else {
           toBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -7051,31 +6895,32 @@ public Builder setTo(
       public Builder mergeTo(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (toBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              to_ != null &&
-              to_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
-            to_ =
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.newBuilder(to_).mergeFrom(value).buildPartial();
+            to_ != null &&
+            to_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
+            getToBuilder().mergeFrom(value);
           } else {
             to_ = value;
           }
-          onChanged();
         } else {
           toBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (to_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .UniqueAddress to = 2;
        */
       public Builder clearTo() {
-        if (toBuilder_ == null) {
-          to_ = null;
-          onChanged();
-        } else {
-          toBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        to_ = null;
+        if (toBuilder_ != null) {
+          toBuilder_.dispose();
+          toBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -7119,6 +6964,7 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuil
        * required bytes serializedGossip = 3;
        * @return Whether the serializedGossip field is set.
        */
+      @java.lang.Override
       public boolean hasSerializedGossip() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -7126,6 +6972,7 @@ public boolean hasSerializedGossip() {
        * required bytes serializedGossip = 3;
        * @return The serializedGossip.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getSerializedGossip() {
         return serializedGossip_;
       }
@@ -7135,11 +6982,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getSerializedGossip() {
        * @return This builder for chaining.
        */
       public Builder setSerializedGossip(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         serializedGossip_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -7186,7 +7031,18 @@ public GossipEnvelope parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new GossipEnvelope(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -7284,7 +7140,7 @@ public interface GossipStatusOrBuilder extends
    *
    * Protobuf type {@code GossipStatus}
    */
-  public  static final class GossipStatus extends
+  public static final class GossipStatus extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:GossipStatus)
       GossipStatusOrBuilder {
@@ -7294,7 +7150,8 @@ private GossipStatus(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Bui
       super(builder);
     }
     private GossipStatus() {
-      allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      allHashes_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       seenDigest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     }
 
@@ -7305,92 +7162,6 @@ protected java.lang.Object newInstance(
       return new GossipStatus();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private GossipStatus(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = from_.toBuilder();
-              }
-              from_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(from_);
-                from_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                allHashes_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              allHashes_.add(bs);
-              break;
-            }
-            case 26: {
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = version_.toBuilder();
-              }
-              version_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(version_);
-                version_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            case 34: {
-              bitField0_ |= 0x00000004;
-              seenDigest_ = input.readBytes();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          allHashes_ = allHashes_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_GossipStatus_descriptor;
@@ -7411,6 +7182,7 @@ private GossipStatus(
      * required .UniqueAddress from = 1;
      * @return Whether the from field is set.
      */
+    @java.lang.Override
     public boolean hasFrom() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -7418,18 +7190,22 @@ public boolean hasFrom() {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom() {
       return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
     }
     /**
      * required .UniqueAddress from = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder() {
       return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
     }
 
     public static final int ALLHASHES_FIELD_NUMBER = 2;
-    private org.apache.pekko.protobufv3.internal.LazyStringList allHashes_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList allHashes_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string allHashes = 2;
      * @return A list containing the allHashes.
@@ -7469,6 +7245,7 @@ public java.lang.String getAllHashes(int index) {
      * required .VectorClock version = 3;
      * @return Whether the version field is set.
      */
+    @java.lang.Override
     public boolean hasVersion() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -7476,22 +7253,25 @@ public boolean hasVersion() {
      * required .VectorClock version = 3;
      * @return The version.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock getVersion() {
       return version_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance() : version_;
     }
     /**
      * required .VectorClock version = 3;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder getVersionOrBuilder() {
       return version_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance() : version_;
     }
 
     public static final int SEENDIGEST_FIELD_NUMBER = 4;
-    private org.apache.pekko.protobufv3.internal.ByteString seenDigest_;
+    private org.apache.pekko.protobufv3.internal.ByteString seenDigest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * optional bytes seenDigest = 4;
      * @return Whether the seenDigest field is set.
      */
+    @java.lang.Override
     public boolean hasSeenDigest() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -7499,6 +7279,7 @@ public boolean hasSeenDigest() {
      * optional bytes seenDigest = 4;
      * @return The seenDigest.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getSeenDigest() {
       return seenDigest_;
     }
@@ -7545,7 +7326,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeBytes(4, seenDigest_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -7574,7 +7355,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(4, seenDigest_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -7606,7 +7387,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getSeenDigest()
             .equals(other.getSeenDigest())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -7633,7 +7414,7 @@ public int hashCode() {
         hash = (37 * hash) + SEENDIGEST_FIELD_NUMBER;
         hash = (53 * hash) + getSeenDigest().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -7682,11 +7463,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -7773,22 +7556,20 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (fromBuilder_ == null) {
-          from_ = null;
-        } else {
-          fromBuilder_.clear();
+        bitField0_ = 0;
+        from_ = null;
+        if (fromBuilder_ != null) {
+          fromBuilder_.dispose();
+          fromBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        if (versionBuilder_ == null) {
-          version_ = null;
-        } else {
-          versionBuilder_.clear();
+        allHashes_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        version_ = null;
+        if (versionBuilder_ != null) {
+          versionBuilder_.dispose();
+          versionBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000004);
         seenDigest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -7815,36 +7596,35 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus build(
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (fromBuilder_ == null) {
-            result.from_ = from_;
-          } else {
-            result.from_ = fromBuilder_.build();
-          }
+          result.from_ = fromBuilder_ == null
+              ? from_
+              : fromBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
-        if (((bitField0_ & 0x00000002) != 0)) {
-          allHashes_ = allHashes_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000002);
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          allHashes_.makeImmutable();
+          result.allHashes_ = allHashes_;
         }
-        result.allHashes_ = allHashes_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
-          if (versionBuilder_ == null) {
-            result.version_ = version_;
-          } else {
-            result.version_ = versionBuilder_.build();
-          }
+          result.version_ = versionBuilder_ == null
+              ? version_
+              : versionBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.seenDigest_ = seenDigest_;
           to_bitField0_ |= 0x00000004;
         }
-        result.seenDigest_ = seenDigest_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -7897,7 +7677,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.G
         if (!other.allHashes_.isEmpty()) {
           if (allHashes_.isEmpty()) {
             allHashes_ = other.allHashes_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ |= 0x00000002;
           } else {
             ensureAllHashesIsMutable();
             allHashes_.addAll(other.allHashes_);
@@ -7910,7 +7690,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.G
         if (other.hasSeenDigest()) {
           setSeenDigest(other.getSeenDigest());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -7937,17 +7717,55 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getFromFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureAllHashesIsMutable();
+                allHashes_.add(bs);
+                break;
+              } // case 18
+              case 26: {
+                input.readMessage(
+                    getVersionFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              case 34: {
+                seenDigest_ = input.readBytes();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 34
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -7982,11 +7800,11 @@ public Builder setFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Uni
             throw new NullPointerException();
           }
           from_ = value;
-          onChanged();
         } else {
           fromBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -7996,11 +7814,11 @@ public Builder setFrom(
           org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
-          onChanged();
         } else {
           fromBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -8009,31 +7827,32 @@ public Builder setFrom(
       public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              from_ != null &&
-              from_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
-            from_ =
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
+            from_ != null &&
+            from_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
+            getFromBuilder().mergeFrom(value);
           } else {
             from_ = value;
           }
-          onChanged();
         } else {
           fromBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (from_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .UniqueAddress from = 1;
        */
       public Builder clearFrom() {
-        if (fromBuilder_ == null) {
-          from_ = null;
-          onChanged();
-        } else {
-          fromBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        from_ = null;
+        if (fromBuilder_ != null) {
+          fromBuilder_.dispose();
+          fromBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -8072,12 +7891,13 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuil
         return fromBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList allHashes_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureAllHashesIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!allHashes_.isModifiable()) {
           allHashes_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(allHashes_);
-          bitField0_ |= 0x00000002;
-         }
+        }
+        bitField0_ |= 0x00000002;
       }
       /**
        * repeated string allHashes = 2;
@@ -8085,7 +7905,8 @@ private void ensureAllHashesIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getAllHashesList() {
-        return allHashes_.getUnmodifiableView();
+        allHashes_.makeImmutable();
+        return allHashes_;
       }
       /**
        * repeated string allHashes = 2;
@@ -8119,11 +7940,10 @@ public java.lang.String getAllHashes(int index) {
        */
       public Builder setAllHashes(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureAllHashesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureAllHashesIsMutable();
         allHashes_.set(index, value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -8134,11 +7954,10 @@ public Builder setAllHashes(
        */
       public Builder addAllHashes(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureAllHashesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureAllHashesIsMutable();
         allHashes_.add(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -8152,6 +7971,7 @@ public Builder addAllAllHashes(
         ensureAllHashesIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, allHashes_);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -8160,8 +7980,9 @@ public Builder addAllAllHashes(
        * @return This builder for chaining.
        */
       public Builder clearAllHashes() {
-        allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        allHashes_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);;
         onChanged();
         return this;
       }
@@ -8172,11 +7993,10 @@ public Builder clearAllHashes() {
        */
       public Builder addAllHashesBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureAllHashesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureAllHashesIsMutable();
         allHashes_.add(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -8211,11 +8031,11 @@ public Builder setVersion(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.
             throw new NullPointerException();
           }
           version_ = value;
-          onChanged();
         } else {
           versionBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -8225,11 +8045,11 @@ public Builder setVersion(
           org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder builderForValue) {
         if (versionBuilder_ == null) {
           version_ = builderForValue.build();
-          onChanged();
         } else {
           versionBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -8238,31 +8058,32 @@ public Builder setVersion(
       public Builder mergeVersion(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock value) {
         if (versionBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
-              version_ != null &&
-              version_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance()) {
-            version_ =
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.newBuilder(version_).mergeFrom(value).buildPartial();
+            version_ != null &&
+            version_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance()) {
+            getVersionBuilder().mergeFrom(value);
           } else {
             version_ = value;
           }
-          onChanged();
         } else {
           versionBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000004;
+        if (version_ != null) {
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .VectorClock version = 3;
        */
       public Builder clearVersion() {
-        if (versionBuilder_ == null) {
-          version_ = null;
-          onChanged();
-        } else {
-          versionBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000004);
+        version_ = null;
+        if (versionBuilder_ != null) {
+          versionBuilder_.dispose();
+          versionBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -8306,6 +8127,7 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilde
        * optional bytes seenDigest = 4;
        * @return Whether the seenDigest field is set.
        */
+      @java.lang.Override
       public boolean hasSeenDigest() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -8313,6 +8135,7 @@ public boolean hasSeenDigest() {
        * optional bytes seenDigest = 4;
        * @return The seenDigest.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getSeenDigest() {
         return seenDigest_;
       }
@@ -8322,11 +8145,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getSeenDigest() {
        * @return This builder for chaining.
        */
       public Builder setSeenDigest(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
+        if (value == null) { throw new NullPointerException(); }
         seenDigest_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -8373,7 +8194,18 @@ public GossipStatus parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new GossipStatus(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -8582,7 +8414,7 @@ org.apache.pekko.cluster.protobuf.msg.ClusterMessages.TombstoneOrBuilder getTomb
    *
    * Protobuf type {@code Gossip}
    */
-  public  static final class Gossip extends
+  public static final class Gossip extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Gossip)
       GossipOrBuilder {
@@ -8593,11 +8425,14 @@ private Gossip(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              allAddresses_.add(
-                  input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry));
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                allRoles_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              allRoles_.add(bs);
-              break;
-            }
-            case 26: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                allHashes_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              allHashes_.add(bs);
-              break;
-            }
-            case 34: {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                members_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              members_.add(
-                  input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.PARSER, extensionRegistry));
-              break;
-            }
-            case 42: {
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = overview_.toBuilder();
-              }
-              overview_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(overview_);
-                overview_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 50: {
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = version_.toBuilder();
-              }
-              version_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(version_);
-                version_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            case 58: {
-              if (!((mutable_bitField0_ & 0x00000040) != 0)) {
-                tombstones_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000040;
-              }
-              tombstones_.add(
-                  input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.PARSER, extensionRegistry));
-              break;
-            }
-            case 66: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000080) != 0)) {
-                allAppVersions_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000080;
-              }
-              allAppVersions_.add(bs);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          allAddresses_ = java.util.Collections.unmodifiableList(allAddresses_);
-        }
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          allRoles_ = allRoles_.getUnmodifiableView();
-        }
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          allHashes_ = allHashes_.getUnmodifiableView();
-        }
-        if (((mutable_bitField0_ & 0x00000008) != 0)) {
-          members_ = java.util.Collections.unmodifiableList(members_);
-        }
-        if (((mutable_bitField0_ & 0x00000040) != 0)) {
-          tombstones_ = java.util.Collections.unmodifiableList(tombstones_);
-        }
-        if (((mutable_bitField0_ & 0x00000080) != 0)) {
-          allAppVersions_ = allAppVersions_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Gossip_descriptor;
@@ -8763,16 +8457,19 @@ private Gossip(
 
     private int bitField0_;
     public static final int ALLADDRESSES_FIELD_NUMBER = 1;
+    @SuppressWarnings("serial")
     private java.util.List allAddresses_;
     /**
      * repeated .UniqueAddress allAddresses = 1;
      */
+    @java.lang.Override
     public java.util.List getAllAddressesList() {
       return allAddresses_;
     }
     /**
      * repeated .UniqueAddress allAddresses = 1;
      */
+    @java.lang.Override
     public java.util.List 
         getAllAddressesOrBuilderList() {
       return allAddresses_;
@@ -8780,25 +8477,30 @@ public java.util.Listrepeated .UniqueAddress allAddresses = 1;
      */
+    @java.lang.Override
     public int getAllAddressesCount() {
       return allAddresses_.size();
     }
     /**
      * repeated .UniqueAddress allAddresses = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getAllAddresses(int index) {
       return allAddresses_.get(index);
     }
     /**
      * repeated .UniqueAddress allAddresses = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getAllAddressesOrBuilder(
         int index) {
       return allAddresses_.get(index);
     }
 
     public static final int ALLROLES_FIELD_NUMBER = 2;
-    private org.apache.pekko.protobufv3.internal.LazyStringList allRoles_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList allRoles_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string allRoles = 2;
      * @return A list containing the allRoles.
@@ -8833,7 +8535,9 @@ public java.lang.String getAllRoles(int index) {
     }
 
     public static final int ALLHASHES_FIELD_NUMBER = 3;
-    private org.apache.pekko.protobufv3.internal.LazyStringList allHashes_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList allHashes_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string allHashes = 3;
      * @return A list containing the allHashes.
@@ -8868,16 +8572,19 @@ public java.lang.String getAllHashes(int index) {
     }
 
     public static final int MEMBERS_FIELD_NUMBER = 4;
+    @SuppressWarnings("serial")
     private java.util.List members_;
     /**
      * repeated .Member members = 4;
      */
+    @java.lang.Override
     public java.util.List getMembersList() {
       return members_;
     }
     /**
      * repeated .Member members = 4;
      */
+    @java.lang.Override
     public java.util.List 
         getMembersOrBuilderList() {
       return members_;
@@ -8885,18 +8592,21 @@ public java.util.Listrepeated .Member members = 4;
      */
+    @java.lang.Override
     public int getMembersCount() {
       return members_.size();
     }
     /**
      * repeated .Member members = 4;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member getMembers(int index) {
       return members_.get(index);
     }
     /**
      * repeated .Member members = 4;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberOrBuilder getMembersOrBuilder(
         int index) {
       return members_.get(index);
@@ -8908,6 +8618,7 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberOrBuilder get
      * required .GossipOverview overview = 5;
      * @return Whether the overview field is set.
      */
+    @java.lang.Override
     public boolean hasOverview() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -8915,12 +8626,14 @@ public boolean hasOverview() {
      * required .GossipOverview overview = 5;
      * @return The overview.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview getOverview() {
       return overview_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.getDefaultInstance() : overview_;
     }
     /**
      * required .GossipOverview overview = 5;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverviewOrBuilder getOverviewOrBuilder() {
       return overview_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.getDefaultInstance() : overview_;
     }
@@ -8931,6 +8644,7 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverviewOrBui
      * required .VectorClock version = 6;
      * @return Whether the version field is set.
      */
+    @java.lang.Override
     public boolean hasVersion() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -8938,27 +8652,32 @@ public boolean hasVersion() {
      * required .VectorClock version = 6;
      * @return The version.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock getVersion() {
       return version_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance() : version_;
     }
     /**
      * required .VectorClock version = 6;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder getVersionOrBuilder() {
       return version_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance() : version_;
     }
 
     public static final int TOMBSTONES_FIELD_NUMBER = 7;
+    @SuppressWarnings("serial")
     private java.util.List tombstones_;
     /**
      * repeated .Tombstone tombstones = 7;
      */
+    @java.lang.Override
     public java.util.List getTombstonesList() {
       return tombstones_;
     }
     /**
      * repeated .Tombstone tombstones = 7;
      */
+    @java.lang.Override
     public java.util.List 
         getTombstonesOrBuilderList() {
       return tombstones_;
@@ -8966,25 +8685,30 @@ public java.util.Listrepeated .Tombstone tombstones = 7;
      */
+    @java.lang.Override
     public int getTombstonesCount() {
       return tombstones_.size();
     }
     /**
      * repeated .Tombstone tombstones = 7;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone getTombstones(int index) {
       return tombstones_.get(index);
     }
     /**
      * repeated .Tombstone tombstones = 7;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.TombstoneOrBuilder getTombstonesOrBuilder(
         int index) {
       return tombstones_.get(index);
     }
 
     public static final int ALLAPPVERSIONS_FIELD_NUMBER = 8;
-    private org.apache.pekko.protobufv3.internal.LazyStringList allAppVersions_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList allAppVersions_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string allAppVersions = 8;
      * @return A list containing the allAppVersions.
@@ -9090,7 +8814,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < allAppVersions_.size(); i++) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 8, allAppVersions_.getRaw(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -9143,7 +8867,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getAllAppVersionsList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -9180,7 +8904,7 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getTombstonesList())) return false;
       if (!getAllAppVersionsList()
           .equals(other.getAllAppVersionsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -9223,7 +8947,7 @@ public int hashCode() {
         hash = (37 * hash) + ALLAPPVERSIONS_FIELD_NUMBER;
         hash = (53 * hash) + getAllAppVersionsList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -9272,11 +8996,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip parse
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -9366,42 +9092,44 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (allAddressesBuilder_ == null) {
           allAddresses_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
+          allAddresses_ = null;
           allAddressesBuilder_.clear();
         }
-        allRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000001);
+        allRoles_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        allHashes_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         if (membersBuilder_ == null) {
           members_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
+          members_ = null;
           membersBuilder_.clear();
         }
-        if (overviewBuilder_ == null) {
-          overview_ = null;
-        } else {
-          overviewBuilder_.clear();
+        bitField0_ = (bitField0_ & ~0x00000008);
+        overview_ = null;
+        if (overviewBuilder_ != null) {
+          overviewBuilder_.dispose();
+          overviewBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000010);
-        if (versionBuilder_ == null) {
-          version_ = null;
-        } else {
-          versionBuilder_.clear();
+        version_ = null;
+        if (versionBuilder_ != null) {
+          versionBuilder_.dispose();
+          versionBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000020);
         if (tombstonesBuilder_ == null) {
           tombstones_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000040);
         } else {
+          tombstones_ = null;
           tombstonesBuilder_.clear();
         }
-        allAppVersions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000080);
+        bitField0_ = (bitField0_ & ~0x00000040);
+        allAppVersions_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         return this;
       }
 
@@ -9428,8 +9156,13 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip build() {
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip result) {
         if (allAddressesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             allAddresses_ = java.util.Collections.unmodifiableList(allAddresses_);
@@ -9439,16 +9172,6 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip buildPartial
         } else {
           result.allAddresses_ = allAddressesBuilder_.build();
         }
-        if (((bitField0_ & 0x00000002) != 0)) {
-          allRoles_ = allRoles_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.allRoles_ = allRoles_;
-        if (((bitField0_ & 0x00000004) != 0)) {
-          allHashes_ = allHashes_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000004);
-        }
-        result.allHashes_ = allHashes_;
         if (membersBuilder_ == null) {
           if (((bitField0_ & 0x00000008) != 0)) {
             members_ = java.util.Collections.unmodifiableList(members_);
@@ -9458,22 +9181,6 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip buildPartial
         } else {
           result.members_ = membersBuilder_.build();
         }
-        if (((from_bitField0_ & 0x00000010) != 0)) {
-          if (overviewBuilder_ == null) {
-            result.overview_ = overview_;
-          } else {
-            result.overview_ = overviewBuilder_.build();
-          }
-          to_bitField0_ |= 0x00000001;
-        }
-        if (((from_bitField0_ & 0x00000020) != 0)) {
-          if (versionBuilder_ == null) {
-            result.version_ = version_;
-          } else {
-            result.version_ = versionBuilder_.build();
-          }
-          to_bitField0_ |= 0x00000002;
-        }
         if (tombstonesBuilder_ == null) {
           if (((bitField0_ & 0x00000040) != 0)) {
             tombstones_ = java.util.Collections.unmodifiableList(tombstones_);
@@ -9483,14 +9190,36 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip buildPartial
         } else {
           result.tombstones_ = tombstonesBuilder_.build();
         }
-        if (((bitField0_ & 0x00000080) != 0)) {
-          allAppVersions_ = allAppVersions_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000080);
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          allRoles_.makeImmutable();
+          result.allRoles_ = allRoles_;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          allHashes_.makeImmutable();
+          result.allHashes_ = allHashes_;
         }
-        result.allAppVersions_ = allAppVersions_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.overview_ = overviewBuilder_ == null
+              ? overview_
+              : overviewBuilder_.build();
+          to_bitField0_ |= 0x00000001;
+        }
+        if (((from_bitField0_ & 0x00000020) != 0)) {
+          result.version_ = versionBuilder_ == null
+              ? version_
+              : versionBuilder_.build();
+          to_bitField0_ |= 0x00000002;
+        }
+        if (((from_bitField0_ & 0x00000080) != 0)) {
+          allAppVersions_.makeImmutable();
+          result.allAppVersions_ = allAppVersions_;
+        }
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -9566,7 +9295,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.G
         if (!other.allRoles_.isEmpty()) {
           if (allRoles_.isEmpty()) {
             allRoles_ = other.allRoles_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ |= 0x00000002;
           } else {
             ensureAllRolesIsMutable();
             allRoles_.addAll(other.allRoles_);
@@ -9576,7 +9305,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.G
         if (!other.allHashes_.isEmpty()) {
           if (allHashes_.isEmpty()) {
             allHashes_ = other.allHashes_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ |= 0x00000004;
           } else {
             ensureAllHashesIsMutable();
             allHashes_.addAll(other.allHashes_);
@@ -9644,14 +9373,14 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.G
         if (!other.allAppVersions_.isEmpty()) {
           if (allAppVersions_.isEmpty()) {
             allAppVersions_ = other.allAppVersions_;
-            bitField0_ = (bitField0_ & ~0x00000080);
+            bitField0_ |= 0x00000080;
           } else {
             ensureAllAppVersionsIsMutable();
             allAppVersions_.addAll(other.allAppVersions_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -9693,17 +9422,101 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER,
+                        extensionRegistry);
+                if (allAddressesBuilder_ == null) {
+                  ensureAllAddressesIsMutable();
+                  allAddresses_.add(m);
+                } else {
+                  allAddressesBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+              case 18: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureAllRolesIsMutable();
+                allRoles_.add(bs);
+                break;
+              } // case 18
+              case 26: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureAllHashesIsMutable();
+                allHashes_.add(bs);
+                break;
+              } // case 26
+              case 34: {
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.PARSER,
+                        extensionRegistry);
+                if (membersBuilder_ == null) {
+                  ensureMembersIsMutable();
+                  members_.add(m);
+                } else {
+                  membersBuilder_.addMessage(m);
+                }
+                break;
+              } // case 34
+              case 42: {
+                input.readMessage(
+                    getOverviewFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 42
+              case 50: {
+                input.readMessage(
+                    getVersionFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000020;
+                break;
+              } // case 50
+              case 58: {
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.PARSER,
+                        extensionRegistry);
+                if (tombstonesBuilder_ == null) {
+                  ensureTombstonesIsMutable();
+                  tombstones_.add(m);
+                } else {
+                  tombstonesBuilder_.addMessage(m);
+                }
+                break;
+              } // case 58
+              case 66: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureAllAppVersionsIsMutable();
+                allAppVersions_.add(bs);
+                break;
+              } // case 66
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -9948,12 +9761,13 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Build
         return allAddressesBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList allRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList allRoles_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureAllRolesIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!allRoles_.isModifiable()) {
           allRoles_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(allRoles_);
-          bitField0_ |= 0x00000002;
-         }
+        }
+        bitField0_ |= 0x00000002;
       }
       /**
        * repeated string allRoles = 2;
@@ -9961,7 +9775,8 @@ private void ensureAllRolesIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getAllRolesList() {
-        return allRoles_.getUnmodifiableView();
+        allRoles_.makeImmutable();
+        return allRoles_;
       }
       /**
        * repeated string allRoles = 2;
@@ -9995,11 +9810,10 @@ public java.lang.String getAllRoles(int index) {
        */
       public Builder setAllRoles(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureAllRolesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureAllRolesIsMutable();
         allRoles_.set(index, value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -10010,11 +9824,10 @@ public Builder setAllRoles(
        */
       public Builder addAllRoles(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureAllRolesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureAllRolesIsMutable();
         allRoles_.add(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -10028,6 +9841,7 @@ public Builder addAllAllRoles(
         ensureAllRolesIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, allRoles_);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -10036,8 +9850,9 @@ public Builder addAllAllRoles(
        * @return This builder for chaining.
        */
       public Builder clearAllRoles() {
-        allRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        allRoles_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);;
         onChanged();
         return this;
       }
@@ -10048,21 +9863,21 @@ public Builder clearAllRoles() {
        */
       public Builder addAllRolesBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureAllRolesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureAllRolesIsMutable();
         allRoles_.add(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList allHashes_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureAllHashesIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
+        if (!allHashes_.isModifiable()) {
           allHashes_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(allHashes_);
-          bitField0_ |= 0x00000004;
-         }
+        }
+        bitField0_ |= 0x00000004;
       }
       /**
        * repeated string allHashes = 3;
@@ -10070,7 +9885,8 @@ private void ensureAllHashesIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getAllHashesList() {
-        return allHashes_.getUnmodifiableView();
+        allHashes_.makeImmutable();
+        return allHashes_;
       }
       /**
        * repeated string allHashes = 3;
@@ -10104,11 +9920,10 @@ public java.lang.String getAllHashes(int index) {
        */
       public Builder setAllHashes(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureAllHashesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureAllHashesIsMutable();
         allHashes_.set(index, value);
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -10119,11 +9934,10 @@ public Builder setAllHashes(
        */
       public Builder addAllHashes(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureAllHashesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureAllHashesIsMutable();
         allHashes_.add(value);
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -10137,6 +9951,7 @@ public Builder addAllAllHashes(
         ensureAllHashesIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, allHashes_);
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -10145,8 +9960,9 @@ public Builder addAllAllHashes(
        * @return This builder for chaining.
        */
       public Builder clearAllHashes() {
-        allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        allHashes_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000004);;
         onChanged();
         return this;
       }
@@ -10157,11 +9973,10 @@ public Builder clearAllHashes() {
        */
       public Builder addAllHashesBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureAllHashesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureAllHashesIsMutable();
         allHashes_.add(value);
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -10436,11 +10251,11 @@ public Builder setOverview(org.apache.pekko.cluster.protobuf.msg.ClusterMessages
             throw new NullPointerException();
           }
           overview_ = value;
-          onChanged();
         } else {
           overviewBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /**
@@ -10450,11 +10265,11 @@ public Builder setOverview(
           org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.Builder builderForValue) {
         if (overviewBuilder_ == null) {
           overview_ = builderForValue.build();
-          onChanged();
         } else {
           overviewBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /**
@@ -10463,31 +10278,32 @@ public Builder setOverview(
       public Builder mergeOverview(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview value) {
         if (overviewBuilder_ == null) {
           if (((bitField0_ & 0x00000010) != 0) &&
-              overview_ != null &&
-              overview_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.getDefaultInstance()) {
-            overview_ =
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.newBuilder(overview_).mergeFrom(value).buildPartial();
+            overview_ != null &&
+            overview_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.getDefaultInstance()) {
+            getOverviewBuilder().mergeFrom(value);
           } else {
             overview_ = value;
           }
-          onChanged();
         } else {
           overviewBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000010;
+        if (overview_ != null) {
+          bitField0_ |= 0x00000010;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .GossipOverview overview = 5;
        */
       public Builder clearOverview() {
-        if (overviewBuilder_ == null) {
-          overview_ = null;
-          onChanged();
-        } else {
-          overviewBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000010);
+        overview_ = null;
+        if (overviewBuilder_ != null) {
+          overviewBuilder_.dispose();
+          overviewBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -10556,11 +10372,11 @@ public Builder setVersion(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.
             throw new NullPointerException();
           }
           version_ = value;
-          onChanged();
         } else {
           versionBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000020;
+        onChanged();
         return this;
       }
       /**
@@ -10570,11 +10386,11 @@ public Builder setVersion(
           org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder builderForValue) {
         if (versionBuilder_ == null) {
           version_ = builderForValue.build();
-          onChanged();
         } else {
           versionBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000020;
+        onChanged();
         return this;
       }
       /**
@@ -10583,31 +10399,32 @@ public Builder setVersion(
       public Builder mergeVersion(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock value) {
         if (versionBuilder_ == null) {
           if (((bitField0_ & 0x00000020) != 0) &&
-              version_ != null &&
-              version_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance()) {
-            version_ =
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.newBuilder(version_).mergeFrom(value).buildPartial();
+            version_ != null &&
+            version_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance()) {
+            getVersionBuilder().mergeFrom(value);
           } else {
             version_ = value;
           }
-          onChanged();
         } else {
           versionBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000020;
+        if (version_ != null) {
+          bitField0_ |= 0x00000020;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .VectorClock version = 6;
        */
       public Builder clearVersion() {
-        if (versionBuilder_ == null) {
-          version_ = null;
-          onChanged();
-        } else {
-          versionBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000020);
+        version_ = null;
+        if (versionBuilder_ != null) {
+          versionBuilder_.dispose();
+          versionBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -10886,12 +10703,13 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder a
         return tombstonesBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList allAppVersions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList allAppVersions_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureAllAppVersionsIsMutable() {
-        if (!((bitField0_ & 0x00000080) != 0)) {
+        if (!allAppVersions_.isModifiable()) {
           allAppVersions_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(allAppVersions_);
-          bitField0_ |= 0x00000080;
-         }
+        }
+        bitField0_ |= 0x00000080;
       }
       /**
        * repeated string allAppVersions = 8;
@@ -10899,7 +10717,8 @@ private void ensureAllAppVersionsIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getAllAppVersionsList() {
-        return allAppVersions_.getUnmodifiableView();
+        allAppVersions_.makeImmutable();
+        return allAppVersions_;
       }
       /**
        * repeated string allAppVersions = 8;
@@ -10933,11 +10752,10 @@ public java.lang.String getAllAppVersions(int index) {
        */
       public Builder setAllAppVersions(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureAllAppVersionsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureAllAppVersionsIsMutable();
         allAppVersions_.set(index, value);
+        bitField0_ |= 0x00000080;
         onChanged();
         return this;
       }
@@ -10948,11 +10766,10 @@ public Builder setAllAppVersions(
        */
       public Builder addAllAppVersions(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureAllAppVersionsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureAllAppVersionsIsMutable();
         allAppVersions_.add(value);
+        bitField0_ |= 0x00000080;
         onChanged();
         return this;
       }
@@ -10966,6 +10783,7 @@ public Builder addAllAllAppVersions(
         ensureAllAppVersionsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, allAppVersions_);
+        bitField0_ |= 0x00000080;
         onChanged();
         return this;
       }
@@ -10974,8 +10792,9 @@ public Builder addAllAllAppVersions(
        * @return This builder for chaining.
        */
       public Builder clearAllAppVersions() {
-        allAppVersions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000080);
+        allAppVersions_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000080);;
         onChanged();
         return this;
       }
@@ -10986,11 +10805,10 @@ public Builder clearAllAppVersions() {
        */
       public Builder addAllAppVersionsBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureAllAppVersionsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureAllAppVersionsIsMutable();
         allAppVersions_.add(value);
+        bitField0_ |= 0x00000080;
         onChanged();
         return this;
       }
@@ -11027,7 +10845,18 @@ public Gossip parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Gossip(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -11112,7 +10941,7 @@ org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachabilityOrBuil
    *
    * Protobuf type {@code GossipOverview}
    */
-  public  static final class GossipOverview extends
+  public static final class GossipOverview extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:GossipOverview)
       GossipOverviewOrBuilder {
@@ -11133,85 +10962,6 @@ protected java.lang.Object newInstance(
       return new GossipOverview();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private GossipOverview(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                seen_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              seen_.addInt(input.readInt32());
-              break;
-            }
-            case 10: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                seen_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                seen_.addInt(input.readInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                observerReachability_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              observerReachability_.add(
-                  input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          seen_.makeImmutable(); // C
-        }
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          observerReachability_ = java.util.Collections.unmodifiableList(observerReachability_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_GossipOverview_descriptor;
@@ -11226,7 +10976,9 @@ private GossipOverview(
     }
 
     public static final int SEEN_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.Internal.IntList seen_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.Internal.IntList seen_ =
+        emptyIntList();
     /**
      * 
      * This is the address indexes for the nodes that have seen this gossip 
@@ -11235,6 +10987,7 @@ private GossipOverview(
      * repeated int32 seen = 1;
      * @return A list containing the seen.
      */
+    @java.lang.Override
     public java.util.List
         getSeenList() {
       return seen_;
@@ -11264,16 +11017,19 @@ public int getSeen(int index) {
     }
 
     public static final int OBSERVERREACHABILITY_FIELD_NUMBER = 2;
+    @SuppressWarnings("serial")
     private java.util.List observerReachability_;
     /**
      * repeated .ObserverReachability observerReachability = 2;
      */
+    @java.lang.Override
     public java.util.List getObserverReachabilityList() {
       return observerReachability_;
     }
     /**
      * repeated .ObserverReachability observerReachability = 2;
      */
+    @java.lang.Override
     public java.util.List 
         getObserverReachabilityOrBuilderList() {
       return observerReachability_;
@@ -11281,18 +11037,21 @@ public java.util.Listrepeated .ObserverReachability observerReachability = 2;
      */
+    @java.lang.Override
     public int getObserverReachabilityCount() {
       return observerReachability_.size();
     }
     /**
      * repeated .ObserverReachability observerReachability = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability getObserverReachability(int index) {
       return observerReachability_.get(index);
     }
     /**
      * repeated .ObserverReachability observerReachability = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachabilityOrBuilder getObserverReachabilityOrBuilder(
         int index) {
       return observerReachability_.get(index);
@@ -11324,7 +11083,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < observerReachability_.size(); i++) {
         output.writeMessage(2, observerReachability_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -11346,7 +11105,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, observerReachability_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -11365,7 +11124,7 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getSeenList())) return false;
       if (!getObserverReachabilityList()
           .equals(other.getObserverReachabilityList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -11384,7 +11143,7 @@ public int hashCode() {
         hash = (37 * hash) + OBSERVERREACHABILITY_FIELD_NUMBER;
         hash = (53 * hash) + getObserverReachabilityList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -11433,11 +11192,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOvervi
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -11506,31 +11267,26 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getObserverReachabilityFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         seen_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         if (observerReachabilityBuilder_ == null) {
           observerReachability_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
+          observerReachability_ = null;
           observerReachabilityBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -11557,12 +11313,13 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview buil
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview(this);
-        int from_bitField0_ = bitField0_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          seen_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.seen_ = seen_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview result) {
         if (observerReachabilityBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
             observerReachability_ = java.util.Collections.unmodifiableList(observerReachability_);
@@ -11572,8 +11329,14 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview buil
         } else {
           result.observerReachability_ = observerReachabilityBuilder_.build();
         }
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          seen_.makeImmutable();
+          result.seen_ = seen_;
+        }
       }
 
       @java.lang.Override
@@ -11623,7 +11386,8 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.G
         if (!other.seen_.isEmpty()) {
           if (seen_.isEmpty()) {
             seen_ = other.seen_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            seen_.makeImmutable();
+            bitField0_ |= 0x00000001;
           } else {
             ensureSeenIsMutable();
             seen_.addAll(other.seen_);
@@ -11656,7 +11420,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.G
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -11676,27 +11440,69 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                int v = input.readInt32();
+                ensureSeenIsMutable();
+                seen_.addInt(v);
+                break;
+              } // case 8
+              case 10: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureSeenIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  seen_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 10
+              case 18: {
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.PARSER,
+                        extensionRegistry);
+                if (observerReachabilityBuilder_ == null) {
+                  ensureObserverReachabilityIsMutable();
+                  observerReachability_.add(m);
+                } else {
+                  observerReachabilityBuilder_.addMessage(m);
+                }
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
 
       private org.apache.pekko.protobufv3.internal.Internal.IntList seen_ = emptyIntList();
       private void ensureSeenIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          seen_ = mutableCopy(seen_);
-          bitField0_ |= 0x00000001;
-         }
+        if (!seen_.isModifiable()) {
+          seen_ = makeMutableCopy(seen_);
+        }
+        bitField0_ |= 0x00000001;
       }
       /**
        * 
@@ -11708,8 +11514,8 @@ private void ensureSeenIsMutable() {
        */
       public java.util.List
           getSeenList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(seen_) : seen_;
+        seen_.makeImmutable();
+        return seen_;
       }
       /**
        * 
@@ -11746,8 +11552,10 @@ public int getSeen(int index) {
        */
       public Builder setSeen(
           int index, int value) {
+
         ensureSeenIsMutable();
         seen_.setInt(index, value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -11761,8 +11569,10 @@ public Builder setSeen(
        * @return This builder for chaining.
        */
       public Builder addSeen(int value) {
+
         ensureSeenIsMutable();
         seen_.addInt(value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -11780,6 +11590,7 @@ public Builder addAllSeen(
         ensureSeenIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, seen_);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -12070,7 +11881,18 @@ public GossipOverview parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new GossipOverview(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -12148,7 +11970,7 @@ org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachabilityOrBuild
    *
    * Protobuf type {@code ObserverReachability}
    */
-  public  static final class ObserverReachability extends
+  public static final class ObserverReachability extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ObserverReachability)
       ObserverReachabilityOrBuilder {
@@ -12168,71 +11990,6 @@ protected java.lang.Object newInstance(
       return new ObserverReachability();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ObserverReachability(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              addressIndex_ = input.readInt32();
-              break;
-            }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                subjectReachability_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              subjectReachability_.add(
-                  input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.PARSER, extensionRegistry));
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000002;
-              version_ = input.readInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          subjectReachability_ = java.util.Collections.unmodifiableList(subjectReachability_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ObserverReachability_descriptor;
@@ -12248,11 +12005,12 @@ private ObserverReachability(
 
     private int bitField0_;
     public static final int ADDRESSINDEX_FIELD_NUMBER = 1;
-    private int addressIndex_;
+    private int addressIndex_ = 0;
     /**
      * required int32 addressIndex = 1;
      * @return Whether the addressIndex field is set.
      */
+    @java.lang.Override
     public boolean hasAddressIndex() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -12260,16 +12018,18 @@ public boolean hasAddressIndex() {
      * required int32 addressIndex = 1;
      * @return The addressIndex.
      */
+    @java.lang.Override
     public int getAddressIndex() {
       return addressIndex_;
     }
 
     public static final int VERSION_FIELD_NUMBER = 4;
-    private long version_;
+    private long version_ = 0L;
     /**
      * required int64 version = 4;
      * @return Whether the version field is set.
      */
+    @java.lang.Override
     public boolean hasVersion() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -12277,21 +12037,25 @@ public boolean hasVersion() {
      * required int64 version = 4;
      * @return The version.
      */
+    @java.lang.Override
     public long getVersion() {
       return version_;
     }
 
     public static final int SUBJECTREACHABILITY_FIELD_NUMBER = 2;
+    @SuppressWarnings("serial")
     private java.util.List subjectReachability_;
     /**
      * repeated .SubjectReachability subjectReachability = 2;
      */
+    @java.lang.Override
     public java.util.List getSubjectReachabilityList() {
       return subjectReachability_;
     }
     /**
      * repeated .SubjectReachability subjectReachability = 2;
      */
+    @java.lang.Override
     public java.util.List 
         getSubjectReachabilityOrBuilderList() {
       return subjectReachability_;
@@ -12299,18 +12063,21 @@ public java.util.Listrepeated .SubjectReachability subjectReachability = 2;
      */
+    @java.lang.Override
     public int getSubjectReachabilityCount() {
       return subjectReachability_.size();
     }
     /**
      * repeated .SubjectReachability subjectReachability = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability getSubjectReachability(int index) {
       return subjectReachability_.get(index);
     }
     /**
      * repeated .SubjectReachability subjectReachability = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachabilityOrBuilder getSubjectReachabilityOrBuilder(
         int index) {
       return subjectReachability_.get(index);
@@ -12353,7 +12120,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeInt64(4, version_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -12374,7 +12141,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(4, version_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -12401,7 +12168,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getSubjectReachabilityList()
           .equals(other.getSubjectReachabilityList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -12425,7 +12192,7 @@ public int hashCode() {
         hash = (37 * hash) + SUBJECTREACHABILITY_FIELD_NUMBER;
         hash = (53 * hash) + getSubjectReachabilityList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -12474,11 +12241,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReac
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -12547,33 +12316,27 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getSubjectReachabilityFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         addressIndex_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000001);
         version_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
         if (subjectReachabilityBuilder_ == null) {
           subjectReachability_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
         } else {
+          subjectReachability_ = null;
           subjectReachabilityBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -12600,6 +12363,25 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachabilit
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability(this);
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability result) {
+        if (subjectReachabilityBuilder_ == null) {
+          if (((bitField0_ & 0x00000004) != 0)) {
+            subjectReachability_ = java.util.Collections.unmodifiableList(subjectReachability_);
+            bitField0_ = (bitField0_ & ~0x00000004);
+          }
+          result.subjectReachability_ = subjectReachability_;
+        } else {
+          result.subjectReachability_ = subjectReachabilityBuilder_.build();
+        }
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -12610,18 +12392,7 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachabilit
           result.version_ = version_;
           to_bitField0_ |= 0x00000002;
         }
-        if (subjectReachabilityBuilder_ == null) {
-          if (((bitField0_ & 0x00000004) != 0)) {
-            subjectReachability_ = java.util.Collections.unmodifiableList(subjectReachability_);
-            bitField0_ = (bitField0_ & ~0x00000004);
-          }
-          result.subjectReachability_ = subjectReachability_;
-        } else {
-          result.subjectReachability_ = subjectReachabilityBuilder_.build();
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -12700,7 +12471,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.O
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -12726,17 +12497,53 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                addressIndex_ = input.readInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 18: {
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.PARSER,
+                        extensionRegistry);
+                if (subjectReachabilityBuilder_ == null) {
+                  ensureSubjectReachabilityIsMutable();
+                  subjectReachability_.add(m);
+                } else {
+                  subjectReachabilityBuilder_.addMessage(m);
+                }
+                break;
+              } // case 18
+              case 32: {
+                version_ = input.readInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 32
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -12746,6 +12553,7 @@ public Builder mergeFrom(
        * required int32 addressIndex = 1;
        * @return Whether the addressIndex field is set.
        */
+      @java.lang.Override
       public boolean hasAddressIndex() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -12753,6 +12561,7 @@ public boolean hasAddressIndex() {
        * required int32 addressIndex = 1;
        * @return The addressIndex.
        */
+      @java.lang.Override
       public int getAddressIndex() {
         return addressIndex_;
       }
@@ -12762,8 +12571,9 @@ public int getAddressIndex() {
        * @return This builder for chaining.
        */
       public Builder setAddressIndex(int value) {
-        bitField0_ |= 0x00000001;
+
         addressIndex_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -12783,6 +12593,7 @@ public Builder clearAddressIndex() {
        * required int64 version = 4;
        * @return Whether the version field is set.
        */
+      @java.lang.Override
       public boolean hasVersion() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -12790,6 +12601,7 @@ public boolean hasVersion() {
        * required int64 version = 4;
        * @return The version.
        */
+      @java.lang.Override
       public long getVersion() {
         return version_;
       }
@@ -12799,8 +12611,9 @@ public long getVersion() {
        * @return This builder for chaining.
        */
       public Builder setVersion(long value) {
-        bitField0_ |= 0x00000002;
+
         version_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -13087,7 +12900,18 @@ public ObserverReachability parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ObserverReachability(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -13147,7 +12971,7 @@ public interface SubjectReachabilityOrBuilder extends
   /**
    * Protobuf type {@code SubjectReachability}
    */
-  public  static final class SubjectReachability extends
+  public static final class SubjectReachability extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:SubjectReachability)
       SubjectReachabilityOrBuilder {
@@ -13167,71 +12991,6 @@ protected java.lang.Object newInstance(
       return new SubjectReachability();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private SubjectReachability(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              addressIndex_ = input.readInt32();
-              break;
-            }
-            case 24: {
-              int rawValue = input.readEnum();
-                @SuppressWarnings("deprecation")
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus value = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(3, rawValue);
-              } else {
-                bitField0_ |= 0x00000002;
-                status_ = rawValue;
-              }
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000004;
-              version_ = input.readInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_SubjectReachability_descriptor;
@@ -13247,11 +13006,12 @@ private SubjectReachability(
 
     private int bitField0_;
     public static final int ADDRESSINDEX_FIELD_NUMBER = 1;
-    private int addressIndex_;
+    private int addressIndex_ = 0;
     /**
      * required int32 addressIndex = 1;
      * @return Whether the addressIndex field is set.
      */
+    @java.lang.Override
     public boolean hasAddressIndex() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -13259,35 +13019,36 @@ public boolean hasAddressIndex() {
      * required int32 addressIndex = 1;
      * @return The addressIndex.
      */
+    @java.lang.Override
     public int getAddressIndex() {
       return addressIndex_;
     }
 
     public static final int STATUS_FIELD_NUMBER = 3;
-    private int status_;
+    private int status_ = 0;
     /**
      * required .ReachabilityStatus status = 3;
      * @return Whether the status field is set.
      */
-    public boolean hasStatus() {
+    @java.lang.Override public boolean hasStatus() {
       return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      * required .ReachabilityStatus status = 3;
      * @return The status.
      */
-    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus getStatus() {
-      @SuppressWarnings("deprecation")
-      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus result = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus.valueOf(status_);
+    @java.lang.Override public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus getStatus() {
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus result = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus.forNumber(status_);
       return result == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus.Reachable : result;
     }
 
     public static final int VERSION_FIELD_NUMBER = 4;
-    private long version_;
+    private long version_ = 0L;
     /**
      * required int64 version = 4;
      * @return Whether the version field is set.
      */
+    @java.lang.Override
     public boolean hasVersion() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -13295,6 +13056,7 @@ public boolean hasVersion() {
      * required int64 version = 4;
      * @return The version.
      */
+    @java.lang.Override
     public long getVersion() {
       return version_;
     }
@@ -13334,7 +13096,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeInt64(4, version_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -13355,7 +13117,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(4, version_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -13384,7 +13146,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getVersion()
             != other.getVersion()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -13408,7 +13170,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getVersion());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -13457,11 +13219,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReach
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -13525,28 +13289,21 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         addressIndex_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000001);
         status_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         version_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -13573,6 +13330,12 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -13580,16 +13343,14 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.status_ = status_;
           to_bitField0_ |= 0x00000002;
         }
-        result.status_ = status_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.version_ = version_;
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -13645,7 +13406,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.S
         if (other.hasVersion()) {
           setVersion(other.getVersion());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -13669,17 +13430,52 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                addressIndex_ = input.readInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 24: {
+                int tmpRaw = input.readEnum();
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus tmpValue =
+                    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(3, tmpRaw);
+                } else {
+                  status_ = tmpRaw;
+                  bitField0_ |= 0x00000002;
+                }
+                break;
+              } // case 24
+              case 32: {
+                version_ = input.readInt64();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 32
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -13689,6 +13485,7 @@ public Builder mergeFrom(
        * required int32 addressIndex = 1;
        * @return Whether the addressIndex field is set.
        */
+      @java.lang.Override
       public boolean hasAddressIndex() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -13696,6 +13493,7 @@ public boolean hasAddressIndex() {
        * required int32 addressIndex = 1;
        * @return The addressIndex.
        */
+      @java.lang.Override
       public int getAddressIndex() {
         return addressIndex_;
       }
@@ -13705,8 +13503,9 @@ public int getAddressIndex() {
        * @return This builder for chaining.
        */
       public Builder setAddressIndex(int value) {
-        bitField0_ |= 0x00000001;
+
         addressIndex_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -13726,16 +13525,16 @@ public Builder clearAddressIndex() {
        * required .ReachabilityStatus status = 3;
        * @return Whether the status field is set.
        */
-      public boolean hasStatus() {
+      @java.lang.Override public boolean hasStatus() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
        * required .ReachabilityStatus status = 3;
        * @return The status.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus getStatus() {
-        @SuppressWarnings("deprecation")
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus result = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus.valueOf(status_);
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus result = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus.forNumber(status_);
         return result == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus.Reachable : result;
       }
       /**
@@ -13768,6 +13567,7 @@ public Builder clearStatus() {
        * required int64 version = 4;
        * @return Whether the version field is set.
        */
+      @java.lang.Override
       public boolean hasVersion() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -13775,6 +13575,7 @@ public boolean hasVersion() {
        * required int64 version = 4;
        * @return The version.
        */
+      @java.lang.Override
       public long getVersion() {
         return version_;
       }
@@ -13784,8 +13585,9 @@ public long getVersion() {
        * @return This builder for chaining.
        */
       public Builder setVersion(long value) {
-        bitField0_ |= 0x00000004;
+
         version_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -13832,7 +13634,18 @@ public SubjectReachability parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new SubjectReachability(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -13881,7 +13694,7 @@ public interface TombstoneOrBuilder extends
   /**
    * Protobuf type {@code Tombstone}
    */
-  public  static final class Tombstone extends
+  public static final class Tombstone extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Tombstone)
       TombstoneOrBuilder {
@@ -13900,59 +13713,6 @@ protected java.lang.Object newInstance(
       return new Tombstone();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Tombstone(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              addressIndex_ = input.readInt32();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              timestamp_ = input.readInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Tombstone_descriptor;
@@ -13968,11 +13728,12 @@ private Tombstone(
 
     private int bitField0_;
     public static final int ADDRESSINDEX_FIELD_NUMBER = 1;
-    private int addressIndex_;
+    private int addressIndex_ = 0;
     /**
      * required int32 addressIndex = 1;
      * @return Whether the addressIndex field is set.
      */
+    @java.lang.Override
     public boolean hasAddressIndex() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -13980,16 +13741,18 @@ public boolean hasAddressIndex() {
      * required int32 addressIndex = 1;
      * @return The addressIndex.
      */
+    @java.lang.Override
     public int getAddressIndex() {
       return addressIndex_;
     }
 
     public static final int TIMESTAMP_FIELD_NUMBER = 2;
-    private long timestamp_;
+    private long timestamp_ = 0L;
     /**
      * required int64 timestamp = 2;
      * @return Whether the timestamp field is set.
      */
+    @java.lang.Override
     public boolean hasTimestamp() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -13997,6 +13760,7 @@ public boolean hasTimestamp() {
      * required int64 timestamp = 2;
      * @return The timestamp.
      */
+    @java.lang.Override
     public long getTimestamp() {
       return timestamp_;
     }
@@ -14029,7 +13793,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeInt64(2, timestamp_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -14046,7 +13810,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(2, timestamp_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -14071,7 +13835,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getTimestamp()
             != other.getTimestamp()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -14091,7 +13855,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getTimestamp());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -14140,11 +13904,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone pa
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -14208,26 +13974,20 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         addressIndex_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000001);
         timestamp_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -14254,6 +14014,12 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone build() {
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -14264,9 +14030,7 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone buildPart
           result.timestamp_ = timestamp_;
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -14319,7 +14083,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.T
         if (other.hasTimestamp()) {
           setTimestamp(other.getTimestamp());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -14340,17 +14104,40 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                addressIndex_ = input.readInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 16: {
+                timestamp_ = input.readInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -14360,6 +14147,7 @@ public Builder mergeFrom(
        * required int32 addressIndex = 1;
        * @return Whether the addressIndex field is set.
        */
+      @java.lang.Override
       public boolean hasAddressIndex() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -14367,6 +14155,7 @@ public boolean hasAddressIndex() {
        * required int32 addressIndex = 1;
        * @return The addressIndex.
        */
+      @java.lang.Override
       public int getAddressIndex() {
         return addressIndex_;
       }
@@ -14376,8 +14165,9 @@ public int getAddressIndex() {
        * @return This builder for chaining.
        */
       public Builder setAddressIndex(int value) {
-        bitField0_ |= 0x00000001;
+
         addressIndex_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -14397,6 +14187,7 @@ public Builder clearAddressIndex() {
        * required int64 timestamp = 2;
        * @return Whether the timestamp field is set.
        */
+      @java.lang.Override
       public boolean hasTimestamp() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -14404,6 +14195,7 @@ public boolean hasTimestamp() {
        * required int64 timestamp = 2;
        * @return The timestamp.
        */
+      @java.lang.Override
       public long getTimestamp() {
         return timestamp_;
       }
@@ -14413,8 +14205,9 @@ public long getTimestamp() {
        * @return This builder for chaining.
        */
       public Builder setTimestamp(long value) {
-        bitField0_ |= 0x00000002;
+
         timestamp_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -14461,7 +14254,18 @@ public Tombstone parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Tombstone(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -14554,7 +14358,7 @@ public interface MemberOrBuilder extends
    *
    * Protobuf type {@code Member}
    */
-  public  static final class Member extends
+  public static final class Member extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Member)
       MemberOrBuilder {
@@ -14575,100 +14379,6 @@ protected java.lang.Object newInstance(
       return new Member();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Member(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              addressIndex_ = input.readInt32();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              upNumber_ = input.readInt32();
-              break;
-            }
-            case 24: {
-              int rawValue = input.readEnum();
-                @SuppressWarnings("deprecation")
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus value = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(3, rawValue);
-              } else {
-                bitField0_ |= 0x00000004;
-                status_ = rawValue;
-              }
-              break;
-            }
-            case 32: {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                rolesIndexes_ = newIntList();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              rolesIndexes_.addInt(input.readInt32());
-              break;
-            }
-            case 34: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) {
-                rolesIndexes_ = newIntList();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                rolesIndexes_.addInt(input.readInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 40: {
-              bitField0_ |= 0x00000008;
-              appVersionIndex_ = input.readInt32();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000008) != 0)) {
-          rolesIndexes_.makeImmutable(); // C
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Member_descriptor;
@@ -14684,11 +14394,12 @@ private Member(
 
     private int bitField0_;
     public static final int ADDRESSINDEX_FIELD_NUMBER = 1;
-    private int addressIndex_;
+    private int addressIndex_ = 0;
     /**
      * required int32 addressIndex = 1;
      * @return Whether the addressIndex field is set.
      */
+    @java.lang.Override
     public boolean hasAddressIndex() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -14696,16 +14407,18 @@ public boolean hasAddressIndex() {
      * required int32 addressIndex = 1;
      * @return The addressIndex.
      */
+    @java.lang.Override
     public int getAddressIndex() {
       return addressIndex_;
     }
 
     public static final int UPNUMBER_FIELD_NUMBER = 2;
-    private int upNumber_;
+    private int upNumber_ = 0;
     /**
      * required int32 upNumber = 2;
      * @return Whether the upNumber field is set.
      */
+    @java.lang.Override
     public boolean hasUpNumber() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -14713,35 +14426,38 @@ public boolean hasUpNumber() {
      * required int32 upNumber = 2;
      * @return The upNumber.
      */
+    @java.lang.Override
     public int getUpNumber() {
       return upNumber_;
     }
 
     public static final int STATUS_FIELD_NUMBER = 3;
-    private int status_;
+    private int status_ = 0;
     /**
      * required .MemberStatus status = 3;
      * @return Whether the status field is set.
      */
-    public boolean hasStatus() {
+    @java.lang.Override public boolean hasStatus() {
       return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      * required .MemberStatus status = 3;
      * @return The status.
      */
-    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus getStatus() {
-      @SuppressWarnings("deprecation")
-      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus result = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus.valueOf(status_);
+    @java.lang.Override public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus getStatus() {
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus result = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus.forNumber(status_);
       return result == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus.Joining : result;
     }
 
     public static final int ROLESINDEXES_FIELD_NUMBER = 4;
-    private org.apache.pekko.protobufv3.internal.Internal.IntList rolesIndexes_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.Internal.IntList rolesIndexes_ =
+        emptyIntList();
     /**
      * repeated int32 rolesIndexes = 4 [packed = true];
      * @return A list containing the rolesIndexes.
      */
+    @java.lang.Override
     public java.util.List
         getRolesIndexesList() {
       return rolesIndexes_;
@@ -14764,11 +14480,12 @@ public int getRolesIndexes(int index) {
     private int rolesIndexesMemoizedSerializedSize = -1;
 
     public static final int APPVERSIONINDEX_FIELD_NUMBER = 5;
-    private int appVersionIndex_;
+    private int appVersionIndex_ = 0;
     /**
      * optional int32 appVersionIndex = 5;
      * @return Whether the appVersionIndex field is set.
      */
+    @java.lang.Override
     public boolean hasAppVersionIndex() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -14776,6 +14493,7 @@ public boolean hasAppVersionIndex() {
      * optional int32 appVersionIndex = 5;
      * @return The appVersionIndex.
      */
+    @java.lang.Override
     public int getAppVersionIndex() {
       return appVersionIndex_;
     }
@@ -14826,7 +14544,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeInt32(5, appVersionIndex_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -14865,7 +14583,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(5, appVersionIndex_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -14901,7 +14619,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getAppVersionIndex()
             != other.getAppVersionIndex()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -14932,7 +14650,7 @@ public int hashCode() {
         hash = (37 * hash) + APPVERSIONINDEX_FIELD_NUMBER;
         hash = (53 * hash) + getAppVersionIndex();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -14981,11 +14699,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member parse
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -15054,32 +14774,23 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         addressIndex_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000001);
         upNumber_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         status_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000004);
         rolesIndexes_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000008);
         appVersionIndex_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
@@ -15106,6 +14817,12 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member build() {
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -15117,21 +14834,18 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member buildPartial
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.status_ = status_;
           to_bitField0_ |= 0x00000004;
         }
-        result.status_ = status_;
-        if (((bitField0_ & 0x00000008) != 0)) {
+        if (((from_bitField0_ & 0x00000008) != 0)) {
           rolesIndexes_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000008);
+          result.rolesIndexes_ = rolesIndexes_;
         }
-        result.rolesIndexes_ = rolesIndexes_;
         if (((from_bitField0_ & 0x00000010) != 0)) {
           result.appVersionIndex_ = appVersionIndex_;
           to_bitField0_ |= 0x00000008;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -15190,7 +14904,8 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.M
         if (!other.rolesIndexes_.isEmpty()) {
           if (rolesIndexes_.isEmpty()) {
             rolesIndexes_ = other.rolesIndexes_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            rolesIndexes_.makeImmutable();
+            bitField0_ |= 0x00000008;
           } else {
             ensureRolesIndexesIsMutable();
             rolesIndexes_.addAll(other.rolesIndexes_);
@@ -15200,7 +14915,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.M
         if (other.hasAppVersionIndex()) {
           setAppVersionIndex(other.getAppVersionIndex());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -15224,17 +14939,73 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                addressIndex_ = input.readInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 16: {
+                upNumber_ = input.readInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                int tmpRaw = input.readEnum();
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus tmpValue =
+                    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(3, tmpRaw);
+                } else {
+                  status_ = tmpRaw;
+                  bitField0_ |= 0x00000004;
+                }
+                break;
+              } // case 24
+              case 32: {
+                int v = input.readInt32();
+                ensureRolesIndexesIsMutable();
+                rolesIndexes_.addInt(v);
+                break;
+              } // case 32
+              case 34: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureRolesIndexesIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  rolesIndexes_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 34
+              case 40: {
+                appVersionIndex_ = input.readInt32();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 40
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -15244,6 +15015,7 @@ public Builder mergeFrom(
        * required int32 addressIndex = 1;
        * @return Whether the addressIndex field is set.
        */
+      @java.lang.Override
       public boolean hasAddressIndex() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -15251,6 +15023,7 @@ public boolean hasAddressIndex() {
        * required int32 addressIndex = 1;
        * @return The addressIndex.
        */
+      @java.lang.Override
       public int getAddressIndex() {
         return addressIndex_;
       }
@@ -15260,8 +15033,9 @@ public int getAddressIndex() {
        * @return This builder for chaining.
        */
       public Builder setAddressIndex(int value) {
-        bitField0_ |= 0x00000001;
+
         addressIndex_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -15281,6 +15055,7 @@ public Builder clearAddressIndex() {
        * required int32 upNumber = 2;
        * @return Whether the upNumber field is set.
        */
+      @java.lang.Override
       public boolean hasUpNumber() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -15288,6 +15063,7 @@ public boolean hasUpNumber() {
        * required int32 upNumber = 2;
        * @return The upNumber.
        */
+      @java.lang.Override
       public int getUpNumber() {
         return upNumber_;
       }
@@ -15297,8 +15073,9 @@ public int getUpNumber() {
        * @return This builder for chaining.
        */
       public Builder setUpNumber(int value) {
-        bitField0_ |= 0x00000002;
+
         upNumber_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -15318,16 +15095,16 @@ public Builder clearUpNumber() {
        * required .MemberStatus status = 3;
        * @return Whether the status field is set.
        */
-      public boolean hasStatus() {
+      @java.lang.Override public boolean hasStatus() {
         return ((bitField0_ & 0x00000004) != 0);
       }
       /**
        * required .MemberStatus status = 3;
        * @return The status.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus getStatus() {
-        @SuppressWarnings("deprecation")
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus result = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus.valueOf(status_);
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus result = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus.forNumber(status_);
         return result == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus.Joining : result;
       }
       /**
@@ -15357,10 +15134,10 @@ public Builder clearStatus() {
 
       private org.apache.pekko.protobufv3.internal.Internal.IntList rolesIndexes_ = emptyIntList();
       private void ensureRolesIndexesIsMutable() {
-        if (!((bitField0_ & 0x00000008) != 0)) {
-          rolesIndexes_ = mutableCopy(rolesIndexes_);
-          bitField0_ |= 0x00000008;
-         }
+        if (!rolesIndexes_.isModifiable()) {
+          rolesIndexes_ = makeMutableCopy(rolesIndexes_);
+        }
+        bitField0_ |= 0x00000008;
       }
       /**
        * repeated int32 rolesIndexes = 4 [packed = true];
@@ -15368,8 +15145,8 @@ private void ensureRolesIndexesIsMutable() {
        */
       public java.util.List
           getRolesIndexesList() {
-        return ((bitField0_ & 0x00000008) != 0) ?
-                 java.util.Collections.unmodifiableList(rolesIndexes_) : rolesIndexes_;
+        rolesIndexes_.makeImmutable();
+        return rolesIndexes_;
       }
       /**
        * repeated int32 rolesIndexes = 4 [packed = true];
@@ -15394,8 +15171,10 @@ public int getRolesIndexes(int index) {
        */
       public Builder setRolesIndexes(
           int index, int value) {
+
         ensureRolesIndexesIsMutable();
         rolesIndexes_.setInt(index, value);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -15405,8 +15184,10 @@ public Builder setRolesIndexes(
        * @return This builder for chaining.
        */
       public Builder addRolesIndexes(int value) {
+
         ensureRolesIndexesIsMutable();
         rolesIndexes_.addInt(value);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -15420,6 +15201,7 @@ public Builder addAllRolesIndexes(
         ensureRolesIndexesIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, rolesIndexes_);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -15439,6 +15221,7 @@ public Builder clearRolesIndexes() {
        * optional int32 appVersionIndex = 5;
        * @return Whether the appVersionIndex field is set.
        */
+      @java.lang.Override
       public boolean hasAppVersionIndex() {
         return ((bitField0_ & 0x00000010) != 0);
       }
@@ -15446,6 +15229,7 @@ public boolean hasAppVersionIndex() {
        * optional int32 appVersionIndex = 5;
        * @return The appVersionIndex.
        */
+      @java.lang.Override
       public int getAppVersionIndex() {
         return appVersionIndex_;
       }
@@ -15455,8 +15239,9 @@ public int getAppVersionIndex() {
        * @return This builder for chaining.
        */
       public Builder setAppVersionIndex(int value) {
-        bitField0_ |= 0x00000010;
+
         appVersionIndex_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -15503,7 +15288,18 @@ public Member parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Member(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -15578,7 +15374,7 @@ org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.VersionOrBuild
    *
    * Protobuf type {@code VectorClock}
    */
-  public  static final class VectorClock extends
+  public static final class VectorClock extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:VectorClock)
       VectorClockOrBuilder {
@@ -15598,66 +15394,6 @@ protected java.lang.Object newInstance(
       return new VectorClock();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private VectorClock(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              timestamp_ = input.readInt64();
-              break;
-            }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                versions_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              versions_.add(
-                  input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          versions_ = java.util.Collections.unmodifiableList(versions_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_descriptor;
@@ -15700,7 +15436,7 @@ public interface VersionOrBuilder extends
     /**
      * Protobuf type {@code VectorClock.Version}
      */
-    public  static final class Version extends
+    public static final class Version extends
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:VectorClock.Version)
         VersionOrBuilder {
@@ -15719,59 +15455,6 @@ protected java.lang.Object newInstance(
         return new Version();
       }
 
-      @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private Version(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 8: {
-                bitField0_ |= 0x00000001;
-                hashIndex_ = input.readInt32();
-                break;
-              }
-              case 16: {
-                bitField0_ |= 0x00000002;
-                timestamp_ = input.readInt64();
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_Version_descriptor;
@@ -15787,11 +15470,12 @@ private Version(
 
       private int bitField0_;
       public static final int HASHINDEX_FIELD_NUMBER = 1;
-      private int hashIndex_;
+      private int hashIndex_ = 0;
       /**
        * required int32 hashIndex = 1;
        * @return Whether the hashIndex field is set.
        */
+      @java.lang.Override
       public boolean hasHashIndex() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -15799,16 +15483,18 @@ public boolean hasHashIndex() {
        * required int32 hashIndex = 1;
        * @return The hashIndex.
        */
+      @java.lang.Override
       public int getHashIndex() {
         return hashIndex_;
       }
 
       public static final int TIMESTAMP_FIELD_NUMBER = 2;
-      private long timestamp_;
+      private long timestamp_ = 0L;
       /**
        * required int64 timestamp = 2;
        * @return Whether the timestamp field is set.
        */
+      @java.lang.Override
       public boolean hasTimestamp() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -15816,6 +15502,7 @@ public boolean hasTimestamp() {
        * required int64 timestamp = 2;
        * @return The timestamp.
        */
+      @java.lang.Override
       public long getTimestamp() {
         return timestamp_;
       }
@@ -15848,7 +15535,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeInt64(2, timestamp_);
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -15865,7 +15552,7 @@ public int getSerializedSize() {
           size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeInt64Size(2, timestamp_);
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -15890,7 +15577,7 @@ public boolean equals(final java.lang.Object obj) {
           if (getTimestamp()
               != other.getTimestamp()) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -15910,7 +15597,7 @@ public int hashCode() {
           hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               getTimestamp());
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -15959,11 +15646,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
+
       public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
+
       public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseDelimitedFrom(
           java.io.InputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -16027,26 +15716,20 @@ public static final class Builder extends
 
         // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.newBuilder()
         private Builder() {
-          maybeForceBuilderInitialization();
+
         }
 
         private Builder(
             org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
-          maybeForceBuilderInitialization();
-        }
-        private void maybeForceBuilderInitialization() {
-          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                  .alwaysUseFieldBuilders) {
-          }
+
         }
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           hashIndex_ = 0;
-          bitField0_ = (bitField0_ & ~0x00000001);
           timestamp_ = 0L;
-          bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
@@ -16073,6 +15756,12 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version
         @java.lang.Override
         public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version buildPartial() {
           org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -16083,9 +15772,7 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version
             result.timestamp_ = timestamp_;
             to_bitField0_ |= 0x00000002;
           }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -16138,7 +15825,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.V
           if (other.hasTimestamp()) {
             setTimestamp(other.getTimestamp());
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -16159,17 +15846,40 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 8: {
+                  hashIndex_ = input.readInt32();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 8
+                case 16: {
+                  timestamp_ = input.readInt64();
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 16
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
         private int bitField0_;
@@ -16179,6 +15889,7 @@ public Builder mergeFrom(
          * required int32 hashIndex = 1;
          * @return Whether the hashIndex field is set.
          */
+        @java.lang.Override
         public boolean hasHashIndex() {
           return ((bitField0_ & 0x00000001) != 0);
         }
@@ -16186,6 +15897,7 @@ public boolean hasHashIndex() {
          * required int32 hashIndex = 1;
          * @return The hashIndex.
          */
+        @java.lang.Override
         public int getHashIndex() {
           return hashIndex_;
         }
@@ -16195,8 +15907,9 @@ public int getHashIndex() {
          * @return This builder for chaining.
          */
         public Builder setHashIndex(int value) {
-          bitField0_ |= 0x00000001;
+
           hashIndex_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -16216,6 +15929,7 @@ public Builder clearHashIndex() {
          * required int64 timestamp = 2;
          * @return Whether the timestamp field is set.
          */
+        @java.lang.Override
         public boolean hasTimestamp() {
           return ((bitField0_ & 0x00000002) != 0);
         }
@@ -16223,6 +15937,7 @@ public boolean hasTimestamp() {
          * required int64 timestamp = 2;
          * @return The timestamp.
          */
+        @java.lang.Override
         public long getTimestamp() {
           return timestamp_;
         }
@@ -16232,8 +15947,9 @@ public long getTimestamp() {
          * @return This builder for chaining.
          */
         public Builder setTimestamp(long value) {
-          bitField0_ |= 0x00000002;
+
           timestamp_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -16280,7 +15996,18 @@ public Version parsePartialFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-          return new Version(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
@@ -16302,7 +16029,7 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version
 
     private int bitField0_;
     public static final int TIMESTAMP_FIELD_NUMBER = 1;
-    private long timestamp_;
+    private long timestamp_ = 0L;
     /**
      * 
      * the timestamp could be removed but left for test data compatibility
@@ -16311,6 +16038,7 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version
      * optional int64 timestamp = 1;
      * @return Whether the timestamp field is set.
      */
+    @java.lang.Override
     public boolean hasTimestamp() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -16322,21 +16050,25 @@ public boolean hasTimestamp() {
      * optional int64 timestamp = 1;
      * @return The timestamp.
      */
+    @java.lang.Override
     public long getTimestamp() {
       return timestamp_;
     }
 
     public static final int VERSIONS_FIELD_NUMBER = 2;
+    @SuppressWarnings("serial")
     private java.util.List versions_;
     /**
      * repeated .VectorClock.Version versions = 2;
      */
+    @java.lang.Override
     public java.util.List getVersionsList() {
       return versions_;
     }
     /**
      * repeated .VectorClock.Version versions = 2;
      */
+    @java.lang.Override
     public java.util.List 
         getVersionsOrBuilderList() {
       return versions_;
@@ -16344,18 +16076,21 @@ public java.util.Listrepeated .VectorClock.Version versions = 2;
      */
+    @java.lang.Override
     public int getVersionsCount() {
       return versions_.size();
     }
     /**
      * repeated .VectorClock.Version versions = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version getVersions(int index) {
       return versions_.get(index);
     }
     /**
      * repeated .VectorClock.Version versions = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.VersionOrBuilder getVersionsOrBuilder(
         int index) {
       return versions_.get(index);
@@ -16387,7 +16122,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < versions_.size(); i++) {
         output.writeMessage(2, versions_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -16404,7 +16139,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, versions_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -16426,7 +16161,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getVersionsList()
           .equals(other.getVersionsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -16446,7 +16181,7 @@ public int hashCode() {
         hash = (37 * hash) + VERSIONS_FIELD_NUMBER;
         hash = (53 * hash) + getVersionsList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -16495,11 +16230,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -16568,31 +16305,26 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getVersionsFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         timestamp_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         if (versionsBuilder_ == null) {
           versions_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
+          versions_ = null;
           versionsBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -16619,12 +16351,13 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock build()
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.timestamp_ = timestamp_;
-          to_bitField0_ |= 0x00000001;
-        }
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock result) {
         if (versionsBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
             versions_ = java.util.Collections.unmodifiableList(versions_);
@@ -16634,9 +16367,16 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock buildPa
         } else {
           result.versions_ = versionsBuilder_.build();
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.timestamp_ = timestamp_;
+          to_bitField0_ |= 0x00000001;
+        }
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -16712,7 +16452,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.V
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -16732,17 +16472,48 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                timestamp_ = input.readInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 18: {
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.PARSER,
+                        extensionRegistry);
+                if (versionsBuilder_ == null) {
+                  ensureVersionsIsMutable();
+                  versions_.add(m);
+                } else {
+                  versionsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -16756,6 +16527,7 @@ public Builder mergeFrom(
        * optional int64 timestamp = 1;
        * @return Whether the timestamp field is set.
        */
+      @java.lang.Override
       public boolean hasTimestamp() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -16767,6 +16539,7 @@ public boolean hasTimestamp() {
        * optional int64 timestamp = 1;
        * @return The timestamp.
        */
+      @java.lang.Override
       public long getTimestamp() {
         return timestamp_;
       }
@@ -16780,8 +16553,9 @@ public long getTimestamp() {
        * @return This builder for chaining.
        */
       public Builder setTimestamp(long value) {
-        bitField0_ |= 0x00000001;
+
         timestamp_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -17072,7 +16846,18 @@ public VectorClock parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new VectorClock(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -17104,7 +16889,7 @@ public interface EmptyOrBuilder extends
    *
    * Protobuf type {@code Empty}
    */
-  public  static final class Empty extends
+  public static final class Empty extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Empty)
       EmptyOrBuilder {
@@ -17123,48 +16908,6 @@ protected java.lang.Object newInstance(
       return new Empty();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Empty(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Empty_descriptor;
@@ -17192,7 +16935,7 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -17201,7 +16944,7 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -17216,7 +16959,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty) obj;
 
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -17227,7 +16970,7 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -17276,11 +17019,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty parseF
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -17349,18 +17094,13 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
@@ -17439,7 +17179,7 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
 
       public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty other) {
         if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty.getDefaultInstance()) return this;
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -17454,17 +17194,30 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       @java.lang.Override
@@ -17500,7 +17253,18 @@ public Empty parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Empty(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -17594,7 +17358,7 @@ public interface AddressOrBuilder extends
    *
    * Protobuf type {@code Address}
    */
-  public  static final class Address extends
+  public static final class Address extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Address)
       AddressOrBuilder {
@@ -17605,83 +17369,17 @@ private Address(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder<
     }
     private Address() {
       system_ = "";
-      hostname_ = "";
-      protocol_ = "";
-    }
-
-    @java.lang.Override
-    @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(
-        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
-      return new Address();
-    }
-
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Address(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              system_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              hostname_ = bs;
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              port_ = input.readUInt32();
-              break;
-            }
-            case 34: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000008;
-              protocol_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
+      hostname_ = "";
+      protocol_ = "";
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+      return new Address();
     }
+
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Address_descriptor;
@@ -17697,11 +17395,13 @@ private Address(
 
     private int bitField0_;
     public static final int SYSTEM_FIELD_NUMBER = 1;
-    private volatile java.lang.Object system_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object system_ = "";
     /**
      * required string system = 1;
      * @return Whether the system field is set.
      */
+    @java.lang.Override
     public boolean hasSystem() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -17709,6 +17409,7 @@ public boolean hasSystem() {
      * required string system = 1;
      * @return The system.
      */
+    @java.lang.Override
     public java.lang.String getSystem() {
       java.lang.Object ref = system_;
       if (ref instanceof java.lang.String) {
@@ -17727,6 +17428,7 @@ public java.lang.String getSystem() {
      * required string system = 1;
      * @return The bytes for system.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getSystemBytes() {
       java.lang.Object ref = system_;
@@ -17742,11 +17444,13 @@ public java.lang.String getSystem() {
     }
 
     public static final int HOSTNAME_FIELD_NUMBER = 2;
-    private volatile java.lang.Object hostname_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object hostname_ = "";
     /**
      * required string hostname = 2;
      * @return Whether the hostname field is set.
      */
+    @java.lang.Override
     public boolean hasHostname() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -17754,6 +17458,7 @@ public boolean hasHostname() {
      * required string hostname = 2;
      * @return The hostname.
      */
+    @java.lang.Override
     public java.lang.String getHostname() {
       java.lang.Object ref = hostname_;
       if (ref instanceof java.lang.String) {
@@ -17772,6 +17477,7 @@ public java.lang.String getHostname() {
      * required string hostname = 2;
      * @return The bytes for hostname.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getHostnameBytes() {
       java.lang.Object ref = hostname_;
@@ -17787,11 +17493,12 @@ public java.lang.String getHostname() {
     }
 
     public static final int PORT_FIELD_NUMBER = 3;
-    private int port_;
+    private int port_ = 0;
     /**
      * required uint32 port = 3;
      * @return Whether the port field is set.
      */
+    @java.lang.Override
     public boolean hasPort() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -17799,16 +17506,19 @@ public boolean hasPort() {
      * required uint32 port = 3;
      * @return The port.
      */
+    @java.lang.Override
     public int getPort() {
       return port_;
     }
 
     public static final int PROTOCOL_FIELD_NUMBER = 4;
-    private volatile java.lang.Object protocol_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object protocol_ = "";
     /**
      * optional string protocol = 4;
      * @return Whether the protocol field is set.
      */
+    @java.lang.Override
     public boolean hasProtocol() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -17816,6 +17526,7 @@ public boolean hasProtocol() {
      * optional string protocol = 4;
      * @return The protocol.
      */
+    @java.lang.Override
     public java.lang.String getProtocol() {
       java.lang.Object ref = protocol_;
       if (ref instanceof java.lang.String) {
@@ -17834,6 +17545,7 @@ public java.lang.String getProtocol() {
      * optional string protocol = 4;
      * @return The bytes for protocol.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getProtocolBytes() {
       java.lang.Object ref = protocol_;
@@ -17886,7 +17598,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000008) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, protocol_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -17908,7 +17620,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000008) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(4, protocol_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -17943,7 +17655,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getProtocol()
             .equals(other.getProtocol())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -17970,7 +17682,7 @@ public int hashCode() {
         hash = (37 * hash) + PROTOCOL_FIELD_NUMBER;
         hash = (53 * hash) + getProtocol().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -18019,11 +17731,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address pars
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -18092,30 +17806,22 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         system_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         hostname_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         port_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000004);
         protocol_ = "";
-        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -18142,27 +17848,31 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address build() {
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.system_ = system_;
           to_bitField0_ |= 0x00000001;
         }
-        result.system_ = system_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.hostname_ = hostname_;
           to_bitField0_ |= 0x00000002;
         }
-        result.hostname_ = hostname_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.port_ = port_;
           to_bitField0_ |= 0x00000004;
         }
         if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.protocol_ = protocol_;
           to_bitField0_ |= 0x00000008;
         }
-        result.protocol_ = protocol_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -18210,24 +17920,24 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address other) {
         if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance()) return this;
         if (other.hasSystem()) {
-          bitField0_ |= 0x00000001;
           system_ = other.system_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasHostname()) {
-          bitField0_ |= 0x00000002;
           hostname_ = other.hostname_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasPort()) {
           setPort(other.getPort());
         }
         if (other.hasProtocol()) {
-          bitField0_ |= 0x00000008;
           protocol_ = other.protocol_;
+          bitField0_ |= 0x00000008;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -18251,17 +17961,50 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                system_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                hostname_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 24: {
+                port_ = input.readUInt32();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 34: {
+                protocol_ = input.readBytes();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 34
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -18316,11 +18059,9 @@ public java.lang.String getSystem() {
        */
       public Builder setSystem(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         system_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -18329,8 +18070,8 @@ public Builder setSystem(
        * @return This builder for chaining.
        */
       public Builder clearSystem() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         system_ = getDefaultInstance().getSystem();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -18341,11 +18082,9 @@ public Builder clearSystem() {
        */
       public Builder setSystemBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         system_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -18400,11 +18139,9 @@ public java.lang.String getHostname() {
        */
       public Builder setHostname(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         hostname_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -18413,8 +18150,8 @@ public Builder setHostname(
        * @return This builder for chaining.
        */
       public Builder clearHostname() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         hostname_ = getDefaultInstance().getHostname();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -18425,11 +18162,9 @@ public Builder clearHostname() {
        */
       public Builder setHostnameBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         hostname_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -18439,6 +18174,7 @@ public Builder setHostnameBytes(
        * required uint32 port = 3;
        * @return Whether the port field is set.
        */
+      @java.lang.Override
       public boolean hasPort() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -18446,6 +18182,7 @@ public boolean hasPort() {
        * required uint32 port = 3;
        * @return The port.
        */
+      @java.lang.Override
       public int getPort() {
         return port_;
       }
@@ -18455,8 +18192,9 @@ public int getPort() {
        * @return This builder for chaining.
        */
       public Builder setPort(int value) {
-        bitField0_ |= 0x00000004;
+
         port_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -18521,11 +18259,9 @@ public java.lang.String getProtocol() {
        */
       public Builder setProtocol(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
+        if (value == null) { throw new NullPointerException(); }
         protocol_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -18534,8 +18270,8 @@ public Builder setProtocol(
        * @return This builder for chaining.
        */
       public Builder clearProtocol() {
-        bitField0_ = (bitField0_ & ~0x00000008);
         protocol_ = getDefaultInstance().getProtocol();
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
@@ -18546,11 +18282,9 @@ public Builder clearProtocol() {
        */
       public Builder setProtocolBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
+        if (value == null) { throw new NullPointerException(); }
         protocol_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -18587,7 +18321,18 @@ public Address parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Address(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -18664,7 +18409,7 @@ public interface UniqueAddressOrBuilder extends
    *
    * Protobuf type {@code UniqueAddress}
    */
-  public  static final class UniqueAddress extends
+  public static final class UniqueAddress extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:UniqueAddress)
       UniqueAddressOrBuilder {
@@ -18683,72 +18428,6 @@ protected java.lang.Object newInstance(
       return new UniqueAddress();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private UniqueAddress(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = address_.toBuilder();
-              }
-              address_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(address_);
-                address_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              uid_ = input.readUInt32();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              uid2_ = input.readUInt32();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_UniqueAddress_descriptor;
@@ -18769,6 +18448,7 @@ private UniqueAddress(
      * required .Address address = 1;
      * @return Whether the address field is set.
      */
+    @java.lang.Override
     public boolean hasAddress() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -18776,22 +18456,25 @@ public boolean hasAddress() {
      * required .Address address = 1;
      * @return The address.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address getAddress() {
       return address_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : address_;
     }
     /**
      * required .Address address = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getAddressOrBuilder() {
       return address_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : address_;
     }
 
     public static final int UID_FIELD_NUMBER = 2;
-    private int uid_;
+    private int uid_ = 0;
     /**
      * required uint32 uid = 2;
      * @return Whether the uid field is set.
      */
+    @java.lang.Override
     public boolean hasUid() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -18799,12 +18482,13 @@ public boolean hasUid() {
      * required uint32 uid = 2;
      * @return The uid.
      */
+    @java.lang.Override
     public int getUid() {
       return uid_;
     }
 
     public static final int UID2_FIELD_NUMBER = 3;
-    private int uid2_;
+    private int uid2_ = 0;
     /**
      * 
      * 64 bit uids but with backward wire compatibility
@@ -18813,6 +18497,7 @@ public int getUid() {
      * optional uint32 uid2 = 3;
      * @return Whether the uid2 field is set.
      */
+    @java.lang.Override
     public boolean hasUid2() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -18824,6 +18509,7 @@ public boolean hasUid2() {
      * optional uint32 uid2 = 3;
      * @return The uid2.
      */
+    @java.lang.Override
     public int getUid2() {
       return uid2_;
     }
@@ -18863,7 +18549,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeUInt32(3, uid2_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -18884,7 +18570,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(3, uid2_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -18914,7 +18600,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getUid2()
             != other.getUid2()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -18937,7 +18623,7 @@ public int hashCode() {
         hash = (37 * hash) + UID2_FIELD_NUMBER;
         hash = (53 * hash) + getUid2();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -18986,11 +18672,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddres
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -19076,16 +18764,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (addressBuilder_ == null) {
-          address_ = null;
-        } else {
-          addressBuilder_.clear();
+        bitField0_ = 0;
+        address_ = null;
+        if (addressBuilder_ != null) {
+          addressBuilder_.dispose();
+          addressBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         uid_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         uid2_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -19112,14 +18798,18 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress build
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (addressBuilder_ == null) {
-            result.address_ = address_;
-          } else {
-            result.address_ = addressBuilder_.build();
-          }
+          result.address_ = addressBuilder_ == null
+              ? address_
+              : addressBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
@@ -19130,9 +18820,7 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress build
           result.uid2_ = uid2_;
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -19188,7 +18876,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.U
         if (other.hasUid2()) {
           setUid2(other.getUid2());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -19212,17 +18900,47 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getAddressFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                uid_ = input.readUInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                uid2_ = input.readUInt32();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -19257,11 +18975,11 @@ public Builder setAddress(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.
             throw new NullPointerException();
           }
           address_ = value;
-          onChanged();
         } else {
           addressBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -19271,11 +18989,11 @@ public Builder setAddress(
           org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder builderForValue) {
         if (addressBuilder_ == null) {
           address_ = builderForValue.build();
-          onChanged();
         } else {
           addressBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -19284,31 +19002,32 @@ public Builder setAddress(
       public Builder mergeAddress(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address value) {
         if (addressBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              address_ != null &&
-              address_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance()) {
-            address_ =
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.newBuilder(address_).mergeFrom(value).buildPartial();
+            address_ != null &&
+            address_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance()) {
+            getAddressBuilder().mergeFrom(value);
           } else {
             address_ = value;
           }
-          onChanged();
         } else {
           addressBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (address_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Address address = 1;
        */
       public Builder clearAddress() {
-        if (addressBuilder_ == null) {
-          address_ = null;
-          onChanged();
-        } else {
-          addressBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        address_ = null;
+        if (addressBuilder_ != null) {
+          addressBuilder_.dispose();
+          addressBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -19352,6 +19071,7 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder ge
        * required uint32 uid = 2;
        * @return Whether the uid field is set.
        */
+      @java.lang.Override
       public boolean hasUid() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -19359,6 +19079,7 @@ public boolean hasUid() {
        * required uint32 uid = 2;
        * @return The uid.
        */
+      @java.lang.Override
       public int getUid() {
         return uid_;
       }
@@ -19368,8 +19089,9 @@ public int getUid() {
        * @return This builder for chaining.
        */
       public Builder setUid(int value) {
-        bitField0_ |= 0x00000002;
+
         uid_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -19393,6 +19115,7 @@ public Builder clearUid() {
        * optional uint32 uid2 = 3;
        * @return Whether the uid2 field is set.
        */
+      @java.lang.Override
       public boolean hasUid2() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -19404,6 +19127,7 @@ public boolean hasUid2() {
        * optional uint32 uid2 = 3;
        * @return The uid2.
        */
+      @java.lang.Override
       public int getUid2() {
         return uid2_;
       }
@@ -19417,8 +19141,9 @@ public int getUid2() {
        * @return This builder for chaining.
        */
       public Builder setUid2(int value) {
-        bitField0_ |= 0x00000004;
+
         uid2_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -19469,7 +19194,18 @@ public UniqueAddress parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new UniqueAddress(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -19526,7 +19262,7 @@ public interface ClusterRouterPoolOrBuilder extends
   /**
    * Protobuf type {@code ClusterRouterPool}
    */
-  public  static final class ClusterRouterPool extends
+  public static final class ClusterRouterPool extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ClusterRouterPool)
       ClusterRouterPoolOrBuilder {
@@ -19545,75 +19281,6 @@ protected java.lang.Object newInstance(
       return new ClusterRouterPool();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ClusterRouterPool(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = pool_.toBuilder();
-              }
-              pool_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(pool_);
-                pool_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = settings_.toBuilder();
-              }
-              settings_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(settings_);
-                settings_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPool_descriptor;
@@ -19634,6 +19301,7 @@ private ClusterRouterPool(
      * required .Pool pool = 1;
      * @return Whether the pool field is set.
      */
+    @java.lang.Override
     public boolean hasPool() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -19641,12 +19309,14 @@ public boolean hasPool() {
      * required .Pool pool = 1;
      * @return The pool.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool getPool() {
       return pool_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.getDefaultInstance() : pool_;
     }
     /**
      * required .Pool pool = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.PoolOrBuilder getPoolOrBuilder() {
       return pool_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.getDefaultInstance() : pool_;
     }
@@ -19657,6 +19327,7 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.PoolOrBuilder getPo
      * required .ClusterRouterPoolSettings settings = 2;
      * @return Whether the settings field is set.
      */
+    @java.lang.Override
     public boolean hasSettings() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -19664,12 +19335,14 @@ public boolean hasSettings() {
      * required .ClusterRouterPoolSettings settings = 2;
      * @return The settings.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings getSettings() {
       return settings_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.getDefaultInstance() : settings_;
     }
     /**
      * required .ClusterRouterPoolSettings settings = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettingsOrBuilder getSettingsOrBuilder() {
       return settings_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.getDefaultInstance() : settings_;
     }
@@ -19710,7 +19383,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getSettings());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -19727,7 +19400,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getSettings());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -19752,7 +19425,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getSettings()
             .equals(other.getSettings())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -19771,7 +19444,7 @@ public int hashCode() {
         hash = (37 * hash) + SETTINGS_FIELD_NUMBER;
         hash = (53 * hash) + getSettings().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -19820,11 +19493,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRoute
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -19906,18 +19581,17 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (poolBuilder_ == null) {
-          pool_ = null;
-        } else {
-          poolBuilder_.clear();
+        bitField0_ = 0;
+        pool_ = null;
+        if (poolBuilder_ != null) {
+          poolBuilder_.dispose();
+          poolBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (settingsBuilder_ == null) {
-          settings_ = null;
-        } else {
-          settingsBuilder_.clear();
+        settings_ = null;
+        if (settingsBuilder_ != null) {
+          settingsBuilder_.dispose();
+          settingsBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -19944,27 +19618,27 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool b
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (poolBuilder_ == null) {
-            result.pool_ = pool_;
-          } else {
-            result.pool_ = poolBuilder_.build();
-          }
+          result.pool_ = poolBuilder_ == null
+              ? pool_
+              : poolBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (settingsBuilder_ == null) {
-            result.settings_ = settings_;
-          } else {
-            result.settings_ = settingsBuilder_.build();
-          }
+          result.settings_ = settingsBuilder_ == null
+              ? settings_
+              : settingsBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -20017,7 +19691,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.C
         if (other.hasSettings()) {
           mergeSettings(other.getSettings());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -20044,17 +19718,44 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getPoolFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getSettingsFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -20089,11 +19790,11 @@ public Builder setPool(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Poo
             throw new NullPointerException();
           }
           pool_ = value;
-          onChanged();
         } else {
           poolBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -20103,11 +19804,11 @@ public Builder setPool(
           org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.Builder builderForValue) {
         if (poolBuilder_ == null) {
           pool_ = builderForValue.build();
-          onChanged();
         } else {
           poolBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -20116,31 +19817,32 @@ public Builder setPool(
       public Builder mergePool(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool value) {
         if (poolBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              pool_ != null &&
-              pool_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.getDefaultInstance()) {
-            pool_ =
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.newBuilder(pool_).mergeFrom(value).buildPartial();
+            pool_ != null &&
+            pool_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.getDefaultInstance()) {
+            getPoolBuilder().mergeFrom(value);
           } else {
             pool_ = value;
           }
-          onChanged();
         } else {
           poolBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (pool_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Pool pool = 1;
        */
       public Builder clearPool() {
-        if (poolBuilder_ == null) {
-          pool_ = null;
-          onChanged();
-        } else {
-          poolBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        pool_ = null;
+        if (poolBuilder_ != null) {
+          poolBuilder_.dispose();
+          poolBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -20209,11 +19911,11 @@ public Builder setSettings(org.apache.pekko.cluster.protobuf.msg.ClusterMessages
             throw new NullPointerException();
           }
           settings_ = value;
-          onChanged();
         } else {
           settingsBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -20223,11 +19925,11 @@ public Builder setSettings(
           org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.Builder builderForValue) {
         if (settingsBuilder_ == null) {
           settings_ = builderForValue.build();
-          onChanged();
         } else {
           settingsBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -20236,31 +19938,32 @@ public Builder setSettings(
       public Builder mergeSettings(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings value) {
         if (settingsBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              settings_ != null &&
-              settings_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.getDefaultInstance()) {
-            settings_ =
-              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.newBuilder(settings_).mergeFrom(value).buildPartial();
+            settings_ != null &&
+            settings_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.getDefaultInstance()) {
+            getSettingsBuilder().mergeFrom(value);
           } else {
             settings_ = value;
           }
-          onChanged();
         } else {
           settingsBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (settings_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .ClusterRouterPoolSettings settings = 2;
        */
       public Builder clearSettings() {
-        if (settingsBuilder_ == null) {
-          settings_ = null;
-          onChanged();
-        } else {
-          settingsBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        settings_ = null;
+        if (settingsBuilder_ != null) {
+          settingsBuilder_.dispose();
+          settingsBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -20331,7 +20034,18 @@ public ClusterRouterPool parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ClusterRouterPool(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -20397,7 +20111,7 @@ public interface PoolOrBuilder extends
   /**
    * Protobuf type {@code Pool}
    */
-  public  static final class Pool extends
+  public static final class Pool extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Pool)
       PoolOrBuilder {
@@ -20418,65 +20132,6 @@ protected java.lang.Object newInstance(
       return new Pool();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Pool(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              serializerId_ = input.readUInt32();
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              manifest_ = bs;
-              break;
-            }
-            case 26: {
-              bitField0_ |= 0x00000004;
-              data_ = input.readBytes();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Pool_descriptor;
@@ -20492,11 +20147,12 @@ private Pool(
 
     private int bitField0_;
     public static final int SERIALIZERID_FIELD_NUMBER = 1;
-    private int serializerId_;
+    private int serializerId_ = 0;
     /**
      * required uint32 serializerId = 1;
      * @return Whether the serializerId field is set.
      */
+    @java.lang.Override
     public boolean hasSerializerId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -20504,16 +20160,19 @@ public boolean hasSerializerId() {
      * required uint32 serializerId = 1;
      * @return The serializerId.
      */
+    @java.lang.Override
     public int getSerializerId() {
       return serializerId_;
     }
 
     public static final int MANIFEST_FIELD_NUMBER = 2;
-    private volatile java.lang.Object manifest_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object manifest_ = "";
     /**
      * required string manifest = 2;
      * @return Whether the manifest field is set.
      */
+    @java.lang.Override
     public boolean hasManifest() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -20521,6 +20180,7 @@ public boolean hasManifest() {
      * required string manifest = 2;
      * @return The manifest.
      */
+    @java.lang.Override
     public java.lang.String getManifest() {
       java.lang.Object ref = manifest_;
       if (ref instanceof java.lang.String) {
@@ -20539,6 +20199,7 @@ public java.lang.String getManifest() {
      * required string manifest = 2;
      * @return The bytes for manifest.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getManifestBytes() {
       java.lang.Object ref = manifest_;
@@ -20554,11 +20215,12 @@ public java.lang.String getManifest() {
     }
 
     public static final int DATA_FIELD_NUMBER = 3;
-    private org.apache.pekko.protobufv3.internal.ByteString data_;
+    private org.apache.pekko.protobufv3.internal.ByteString data_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * required bytes data = 3;
      * @return Whether the data field is set.
      */
+    @java.lang.Override
     public boolean hasData() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -20566,6 +20228,7 @@ public boolean hasData() {
      * required bytes data = 3;
      * @return The data.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getData() {
       return data_;
     }
@@ -20605,7 +20268,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeBytes(3, data_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -20625,7 +20288,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(3, data_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -20655,7 +20318,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getData()
             .equals(other.getData())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -20678,7 +20341,7 @@ public int hashCode() {
         hash = (37 * hash) + DATA_FIELD_NUMBER;
         hash = (53 * hash) + getData().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -20727,11 +20390,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool parseFr
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -20795,28 +20460,21 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         serializerId_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000001);
         manifest_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         data_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -20843,6 +20501,12 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool build() {
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -20850,16 +20514,14 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool buildPartial()
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.manifest_ = manifest_;
           to_bitField0_ |= 0x00000002;
         }
-        result.manifest_ = manifest_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.data_ = data_;
           to_bitField0_ |= 0x00000004;
         }
-        result.data_ = data_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -20910,14 +20572,14 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.P
           setSerializerId(other.getSerializerId());
         }
         if (other.hasManifest()) {
-          bitField0_ |= 0x00000002;
           manifest_ = other.manifest_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasData()) {
           setData(other.getData());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -20941,17 +20603,45 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                serializerId_ = input.readUInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 18: {
+                manifest_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 26: {
+                data_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -20961,6 +20651,7 @@ public Builder mergeFrom(
        * required uint32 serializerId = 1;
        * @return Whether the serializerId field is set.
        */
+      @java.lang.Override
       public boolean hasSerializerId() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -20968,6 +20659,7 @@ public boolean hasSerializerId() {
        * required uint32 serializerId = 1;
        * @return The serializerId.
        */
+      @java.lang.Override
       public int getSerializerId() {
         return serializerId_;
       }
@@ -20977,8 +20669,9 @@ public int getSerializerId() {
        * @return This builder for chaining.
        */
       public Builder setSerializerId(int value) {
-        bitField0_ |= 0x00000001;
+
         serializerId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -21043,11 +20736,9 @@ public java.lang.String getManifest() {
        */
       public Builder setManifest(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         manifest_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -21056,8 +20747,8 @@ public Builder setManifest(
        * @return This builder for chaining.
        */
       public Builder clearManifest() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         manifest_ = getDefaultInstance().getManifest();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -21068,11 +20759,9 @@ public Builder clearManifest() {
        */
       public Builder setManifestBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         manifest_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -21082,6 +20771,7 @@ public Builder setManifestBytes(
        * required bytes data = 3;
        * @return Whether the data field is set.
        */
+      @java.lang.Override
       public boolean hasData() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -21089,6 +20779,7 @@ public boolean hasData() {
        * required bytes data = 3;
        * @return The data.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getData() {
         return data_;
       }
@@ -21098,11 +20789,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getData() {
        * @return This builder for chaining.
        */
       public Builder setData(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         data_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -21149,7 +20838,18 @@ public Pool parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Pool(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -21251,7 +20951,7 @@ public interface ClusterRouterPoolSettingsOrBuilder extends
   /**
    * Protobuf type {@code ClusterRouterPoolSettings}
    */
-  public  static final class ClusterRouterPoolSettings extends
+  public static final class ClusterRouterPoolSettings extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ClusterRouterPoolSettings)
       ClusterRouterPoolSettingsOrBuilder {
@@ -21262,7 +20962,8 @@ private ClusterRouterPoolSettings(org.apache.pekko.protobufv3.internal.Generated
     }
     private ClusterRouterPoolSettings() {
       useRole_ = "";
-      useRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      useRoles_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -21272,82 +20973,6 @@ protected java.lang.Object newInstance(
       return new ClusterRouterPoolSettings();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ClusterRouterPoolSettings(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              totalInstances_ = input.readUInt32();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              maxInstancesPerNode_ = input.readUInt32();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              allowLocalRoutees_ = input.readBool();
-              break;
-            }
-            case 34: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000008;
-              useRole_ = bs;
-              break;
-            }
-            case 42: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
-                useRoles_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000010;
-              }
-              useRoles_.add(bs);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000010) != 0)) {
-          useRoles_ = useRoles_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPoolSettings_descriptor;
@@ -21363,11 +20988,12 @@ private ClusterRouterPoolSettings(
 
     private int bitField0_;
     public static final int TOTALINSTANCES_FIELD_NUMBER = 1;
-    private int totalInstances_;
+    private int totalInstances_ = 0;
     /**
      * required uint32 totalInstances = 1;
      * @return Whether the totalInstances field is set.
      */
+    @java.lang.Override
     public boolean hasTotalInstances() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -21375,16 +21001,18 @@ public boolean hasTotalInstances() {
      * required uint32 totalInstances = 1;
      * @return The totalInstances.
      */
+    @java.lang.Override
     public int getTotalInstances() {
       return totalInstances_;
     }
 
     public static final int MAXINSTANCESPERNODE_FIELD_NUMBER = 2;
-    private int maxInstancesPerNode_;
+    private int maxInstancesPerNode_ = 0;
     /**
      * required uint32 maxInstancesPerNode = 2;
      * @return Whether the maxInstancesPerNode field is set.
      */
+    @java.lang.Override
     public boolean hasMaxInstancesPerNode() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -21392,16 +21020,18 @@ public boolean hasMaxInstancesPerNode() {
      * required uint32 maxInstancesPerNode = 2;
      * @return The maxInstancesPerNode.
      */
+    @java.lang.Override
     public int getMaxInstancesPerNode() {
       return maxInstancesPerNode_;
     }
 
     public static final int ALLOWLOCALROUTEES_FIELD_NUMBER = 3;
-    private boolean allowLocalRoutees_;
+    private boolean allowLocalRoutees_ = false;
     /**
      * required bool allowLocalRoutees = 3;
      * @return Whether the allowLocalRoutees field is set.
      */
+    @java.lang.Override
     public boolean hasAllowLocalRoutees() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -21409,16 +21039,19 @@ public boolean hasAllowLocalRoutees() {
      * required bool allowLocalRoutees = 3;
      * @return The allowLocalRoutees.
      */
+    @java.lang.Override
     public boolean getAllowLocalRoutees() {
       return allowLocalRoutees_;
     }
 
     public static final int USEROLE_FIELD_NUMBER = 4;
-    private volatile java.lang.Object useRole_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object useRole_ = "";
     /**
      * optional string useRole = 4;
      * @return Whether the useRole field is set.
      */
+    @java.lang.Override
     public boolean hasUseRole() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -21426,6 +21059,7 @@ public boolean hasUseRole() {
      * optional string useRole = 4;
      * @return The useRole.
      */
+    @java.lang.Override
     public java.lang.String getUseRole() {
       java.lang.Object ref = useRole_;
       if (ref instanceof java.lang.String) {
@@ -21444,6 +21078,7 @@ public java.lang.String getUseRole() {
      * optional string useRole = 4;
      * @return The bytes for useRole.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getUseRoleBytes() {
       java.lang.Object ref = useRole_;
@@ -21459,7 +21094,9 @@ public java.lang.String getUseRole() {
     }
 
     public static final int USEROLES_FIELD_NUMBER = 5;
-    private org.apache.pekko.protobufv3.internal.LazyStringList useRoles_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList useRoles_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string useRoles = 5;
      * @return A list containing the useRoles.
@@ -21534,7 +21171,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < useRoles_.size(); i++) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 5, useRoles_.getRaw(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -21566,7 +21203,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getUseRolesList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -21603,7 +21240,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getUseRolesList()
           .equals(other.getUseRolesList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -21635,7 +21272,7 @@ public int hashCode() {
         hash = (37 * hash) + USEROLES_FIELD_NUMBER;
         hash = (53 * hash) + getUseRolesList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -21684,11 +21321,13 @@ public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRoute
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -21752,32 +21391,24 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         totalInstances_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000001);
         maxInstancesPerNode_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         allowLocalRoutees_ = false;
-        bitField0_ = (bitField0_ & ~0x00000004);
         useRole_ = "";
-        bitField0_ = (bitField0_ & ~0x00000008);
-        useRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000010);
+        useRoles_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         return this;
       }
 
@@ -21804,6 +21435,12 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSe
       @java.lang.Override
       public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings buildPartial() {
         org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -21819,17 +21456,14 @@ public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSe
           to_bitField0_ |= 0x00000004;
         }
         if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.useRole_ = useRole_;
           to_bitField0_ |= 0x00000008;
         }
-        result.useRole_ = useRole_;
-        if (((bitField0_ & 0x00000010) != 0)) {
-          useRoles_ = useRoles_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000010);
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          useRoles_.makeImmutable();
+          result.useRoles_ = useRoles_;
         }
-        result.useRoles_ = useRoles_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -21886,21 +21520,21 @@ public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.C
           setAllowLocalRoutees(other.getAllowLocalRoutees());
         }
         if (other.hasUseRole()) {
-          bitField0_ |= 0x00000008;
           useRole_ = other.useRole_;
+          bitField0_ |= 0x00000008;
           onChanged();
         }
         if (!other.useRoles_.isEmpty()) {
           if (useRoles_.isEmpty()) {
             useRoles_ = other.useRoles_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            bitField0_ |= 0x00000010;
           } else {
             ensureUseRolesIsMutable();
             useRoles_.addAll(other.useRoles_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -21924,17 +21558,56 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                totalInstances_ = input.readUInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 16: {
+                maxInstancesPerNode_ = input.readUInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                allowLocalRoutees_ = input.readBool();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 34: {
+                useRole_ = input.readBytes();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 34
+              case 42: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureUseRolesIsMutable();
+                useRoles_.add(bs);
+                break;
+              } // case 42
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -21944,6 +21617,7 @@ public Builder mergeFrom(
        * required uint32 totalInstances = 1;
        * @return Whether the totalInstances field is set.
        */
+      @java.lang.Override
       public boolean hasTotalInstances() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -21951,6 +21625,7 @@ public boolean hasTotalInstances() {
        * required uint32 totalInstances = 1;
        * @return The totalInstances.
        */
+      @java.lang.Override
       public int getTotalInstances() {
         return totalInstances_;
       }
@@ -21960,8 +21635,9 @@ public int getTotalInstances() {
        * @return This builder for chaining.
        */
       public Builder setTotalInstances(int value) {
-        bitField0_ |= 0x00000001;
+
         totalInstances_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -21981,6 +21657,7 @@ public Builder clearTotalInstances() {
        * required uint32 maxInstancesPerNode = 2;
        * @return Whether the maxInstancesPerNode field is set.
        */
+      @java.lang.Override
       public boolean hasMaxInstancesPerNode() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -21988,6 +21665,7 @@ public boolean hasMaxInstancesPerNode() {
        * required uint32 maxInstancesPerNode = 2;
        * @return The maxInstancesPerNode.
        */
+      @java.lang.Override
       public int getMaxInstancesPerNode() {
         return maxInstancesPerNode_;
       }
@@ -21997,8 +21675,9 @@ public int getMaxInstancesPerNode() {
        * @return This builder for chaining.
        */
       public Builder setMaxInstancesPerNode(int value) {
-        bitField0_ |= 0x00000002;
+
         maxInstancesPerNode_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -22018,6 +21697,7 @@ public Builder clearMaxInstancesPerNode() {
        * required bool allowLocalRoutees = 3;
        * @return Whether the allowLocalRoutees field is set.
        */
+      @java.lang.Override
       public boolean hasAllowLocalRoutees() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -22025,6 +21705,7 @@ public boolean hasAllowLocalRoutees() {
        * required bool allowLocalRoutees = 3;
        * @return The allowLocalRoutees.
        */
+      @java.lang.Override
       public boolean getAllowLocalRoutees() {
         return allowLocalRoutees_;
       }
@@ -22034,8 +21715,9 @@ public boolean getAllowLocalRoutees() {
        * @return This builder for chaining.
        */
       public Builder setAllowLocalRoutees(boolean value) {
-        bitField0_ |= 0x00000004;
+
         allowLocalRoutees_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -22100,11 +21782,9 @@ public java.lang.String getUseRole() {
        */
       public Builder setUseRole(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
+        if (value == null) { throw new NullPointerException(); }
         useRole_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -22113,8 +21793,8 @@ public Builder setUseRole(
        * @return This builder for chaining.
        */
       public Builder clearUseRole() {
-        bitField0_ = (bitField0_ & ~0x00000008);
         useRole_ = getDefaultInstance().getUseRole();
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
@@ -22125,21 +21805,20 @@ public Builder clearUseRole() {
        */
       public Builder setUseRoleBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
+        if (value == null) { throw new NullPointerException(); }
         useRole_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList useRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList useRoles_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureUseRolesIsMutable() {
-        if (!((bitField0_ & 0x00000010) != 0)) {
+        if (!useRoles_.isModifiable()) {
           useRoles_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(useRoles_);
-          bitField0_ |= 0x00000010;
-         }
+        }
+        bitField0_ |= 0x00000010;
       }
       /**
        * repeated string useRoles = 5;
@@ -22147,7 +21826,8 @@ private void ensureUseRolesIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getUseRolesList() {
-        return useRoles_.getUnmodifiableView();
+        useRoles_.makeImmutable();
+        return useRoles_;
       }
       /**
        * repeated string useRoles = 5;
@@ -22181,11 +21861,10 @@ public java.lang.String getUseRoles(int index) {
        */
       public Builder setUseRoles(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureUseRolesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureUseRolesIsMutable();
         useRoles_.set(index, value);
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -22196,11 +21875,10 @@ public Builder setUseRoles(
        */
       public Builder addUseRoles(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureUseRolesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureUseRolesIsMutable();
         useRoles_.add(value);
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -22214,6 +21892,7 @@ public Builder addAllUseRoles(
         ensureUseRolesIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, useRoles_);
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -22222,8 +21901,9 @@ public Builder addAllUseRoles(
        * @return This builder for chaining.
        */
       public Builder clearUseRoles() {
-        useRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000010);
+        useRoles_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000010);;
         onChanged();
         return this;
       }
@@ -22234,11 +21914,10 @@ public Builder clearUseRoles() {
        */
       public Builder addUseRolesBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureUseRolesIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureUseRolesIsMutable();
         useRoles_.add(value);
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -22275,7 +21954,18 @@ public ClusterRouterPoolSettings parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ClusterRouterPoolSettings(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
diff --git a/distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatedDataMessages.java b/distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatedDataMessages.java
index 6ba398172fd..3f94d17df53 100644
--- a/distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatedDataMessages.java
+++ b/distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatedDataMessages.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2020-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ReplicatedDataMessages.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.cluster.ddata.protobuf.msg;
 
 public final class ReplicatedDataMessages {
@@ -377,7 +378,7 @@ org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBui
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.GSet}
    */
-  public  static final class GSet extends
+  public static final class GSet extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.GSet)
       GSetOrBuilder {
@@ -387,11 +388,13 @@ private GSet(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
       super(builder);
     }
     private GSet() {
-      stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      stringElements_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       intElements_ = emptyIntList();
       longElements_ = emptyLongList();
       otherElements_ = java.util.Collections.emptyList();
-      actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      actorRefElements_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -401,133 +404,6 @@ protected java.lang.Object newInstance(
       return new GSet();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private GSet(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                stringElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              stringElements_.add(bs);
-              break;
-            }
-            case 16: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                intElements_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              intElements_.addInt(input.readSInt32());
-              break;
-            }
-            case 18: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                intElements_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                intElements_.addInt(input.readSInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 24: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                longElements_ = newLongList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              longElements_.addLong(input.readSInt64());
-              break;
-            }
-            case 26: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
-                longElements_ = newLongList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                longElements_.addLong(input.readSInt64());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 34: {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                otherElements_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              otherElements_.add(
-                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry));
-              break;
-            }
-            case 42: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
-                actorRefElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000010;
-              }
-              actorRefElements_.add(bs);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          stringElements_ = stringElements_.getUnmodifiableView();
-        }
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          intElements_.makeImmutable(); // C
-        }
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          longElements_.makeImmutable(); // C
-        }
-        if (((mutable_bitField0_ & 0x00000008) != 0)) {
-          otherElements_ = java.util.Collections.unmodifiableList(otherElements_);
-        }
-        if (((mutable_bitField0_ & 0x00000010) != 0)) {
-          actorRefElements_ = actorRefElements_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_GSet_descriptor;
@@ -542,7 +418,9 @@ private GSet(
     }
 
     public static final int STRINGELEMENTS_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.LazyStringList stringElements_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList stringElements_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string stringElements = 1;
      * @return A list containing the stringElements.
@@ -577,11 +455,14 @@ public java.lang.String getStringElements(int index) {
     }
 
     public static final int INTELEMENTS_FIELD_NUMBER = 2;
-    private org.apache.pekko.protobufv3.internal.Internal.IntList intElements_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.Internal.IntList intElements_ =
+        emptyIntList();
     /**
      * repeated sint32 intElements = 2 [packed = true];
      * @return A list containing the intElements.
      */
+    @java.lang.Override
     public java.util.List
         getIntElementsList() {
       return intElements_;
@@ -604,11 +485,14 @@ public int getIntElements(int index) {
     private int intElementsMemoizedSerializedSize = -1;
 
     public static final int LONGELEMENTS_FIELD_NUMBER = 3;
-    private org.apache.pekko.protobufv3.internal.Internal.LongList longElements_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.Internal.LongList longElements_ =
+        emptyLongList();
     /**
      * repeated sint64 longElements = 3 [packed = true];
      * @return A list containing the longElements.
      */
+    @java.lang.Override
     public java.util.List
         getLongElementsList() {
       return longElements_;
@@ -631,16 +515,19 @@ public long getLongElements(int index) {
     private int longElementsMemoizedSerializedSize = -1;
 
     public static final int OTHERELEMENTS_FIELD_NUMBER = 4;
+    @SuppressWarnings("serial")
     private java.util.List otherElements_;
     /**
      * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
      */
+    @java.lang.Override
     public java.util.List getOtherElementsList() {
       return otherElements_;
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
      */
+    @java.lang.Override
     public java.util.List 
         getOtherElementsOrBuilderList() {
       return otherElements_;
@@ -648,25 +535,30 @@ public java.util.Listrepeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
      */
+    @java.lang.Override
     public int getOtherElementsCount() {
       return otherElements_.size();
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherElements(int index) {
       return otherElements_.get(index);
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherElementsOrBuilder(
         int index) {
       return otherElements_.get(index);
     }
 
     public static final int ACTORREFELEMENTS_FIELD_NUMBER = 5;
-    private org.apache.pekko.protobufv3.internal.LazyStringList actorRefElements_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList actorRefElements_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * 
      * added in Akka 2.5.14
@@ -760,7 +652,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < actorRefElements_.size(); i++) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 5, actorRefElements_.getRaw(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -817,7 +709,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getActorRefElementsList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -842,7 +734,7 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getOtherElementsList())) return false;
       if (!getActorRefElementsList()
           .equals(other.getActorRefElementsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -873,7 +765,7 @@ public int hashCode() {
         hash = (37 * hash) + ACTORREFELEMENTS_FIELD_NUMBER;
         hash = (53 * hash) + getActorRefElementsList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -922,11 +814,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -990,37 +884,31 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getOtherElementsFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = 0;
+        stringElements_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         intElements_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
         longElements_ = emptyLongList();
-        bitField0_ = (bitField0_ & ~0x00000004);
         if (otherElementsBuilder_ == null) {
           otherElements_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
+          otherElements_ = null;
           otherElementsBuilder_.clear();
         }
-        actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000010);
+        bitField0_ = (bitField0_ & ~0x00000008);
+        actorRefElements_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         return this;
       }
 
@@ -1047,22 +935,13 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet b
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet(this);
-        int from_bitField0_ = bitField0_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          stringElements_ = stringElements_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.stringElements_ = stringElements_;
-        if (((bitField0_ & 0x00000002) != 0)) {
-          intElements_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.intElements_ = intElements_;
-        if (((bitField0_ & 0x00000004) != 0)) {
-          longElements_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000004);
-        }
-        result.longElements_ = longElements_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet result) {
         if (otherElementsBuilder_ == null) {
           if (((bitField0_ & 0x00000008) != 0)) {
             otherElements_ = java.util.Collections.unmodifiableList(otherElements_);
@@ -1072,13 +951,26 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet b
         } else {
           result.otherElements_ = otherElementsBuilder_.build();
         }
-        if (((bitField0_ & 0x00000010) != 0)) {
-          actorRefElements_ = actorRefElements_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000010);
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          stringElements_.makeImmutable();
+          result.stringElements_ = stringElements_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          intElements_.makeImmutable();
+          result.intElements_ = intElements_;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          longElements_.makeImmutable();
+          result.longElements_ = longElements_;
+        }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          actorRefElements_.makeImmutable();
+          result.actorRefElements_ = actorRefElements_;
         }
-        result.actorRefElements_ = actorRefElements_;
-        onBuilt();
-        return result;
       }
 
       @java.lang.Override
@@ -1128,7 +1020,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
         if (!other.stringElements_.isEmpty()) {
           if (stringElements_.isEmpty()) {
             stringElements_ = other.stringElements_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ |= 0x00000001;
           } else {
             ensureStringElementsIsMutable();
             stringElements_.addAll(other.stringElements_);
@@ -1138,7 +1030,8 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
         if (!other.intElements_.isEmpty()) {
           if (intElements_.isEmpty()) {
             intElements_ = other.intElements_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            intElements_.makeImmutable();
+            bitField0_ |= 0x00000002;
           } else {
             ensureIntElementsIsMutable();
             intElements_.addAll(other.intElements_);
@@ -1148,7 +1041,8 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
         if (!other.longElements_.isEmpty()) {
           if (longElements_.isEmpty()) {
             longElements_ = other.longElements_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            longElements_.makeImmutable();
+            bitField0_ |= 0x00000004;
           } else {
             ensureLongElementsIsMutable();
             longElements_.addAll(other.longElements_);
@@ -1184,14 +1078,14 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
         if (!other.actorRefElements_.isEmpty()) {
           if (actorRefElements_.isEmpty()) {
             actorRefElements_ = other.actorRefElements_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            bitField0_ |= 0x00000010;
           } else {
             ensureActorRefElementsIsMutable();
             actorRefElements_.addAll(other.actorRefElements_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1211,27 +1105,98 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureStringElementsIsMutable();
+                stringElements_.add(bs);
+                break;
+              } // case 10
+              case 16: {
+                int v = input.readSInt32();
+                ensureIntElementsIsMutable();
+                intElements_.addInt(v);
+                break;
+              } // case 16
+              case 18: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureIntElementsIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  intElements_.addInt(input.readSInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 18
+              case 24: {
+                long v = input.readSInt64();
+                ensureLongElementsIsMutable();
+                longElements_.addLong(v);
+                break;
+              } // case 24
+              case 26: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureLongElementsIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  longElements_.addLong(input.readSInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 26
+              case 34: {
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER,
+                        extensionRegistry);
+                if (otherElementsBuilder_ == null) {
+                  ensureOtherElementsIsMutable();
+                  otherElements_.add(m);
+                } else {
+                  otherElementsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 34
+              case 42: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureActorRefElementsIsMutable();
+                actorRefElements_.add(bs);
+                break;
+              } // case 42
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList stringElements_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureStringElementsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!stringElements_.isModifiable()) {
           stringElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(stringElements_);
-          bitField0_ |= 0x00000001;
-         }
+        }
+        bitField0_ |= 0x00000001;
       }
       /**
        * repeated string stringElements = 1;
@@ -1239,7 +1204,8 @@ private void ensureStringElementsIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getStringElementsList() {
-        return stringElements_.getUnmodifiableView();
+        stringElements_.makeImmutable();
+        return stringElements_;
       }
       /**
        * repeated string stringElements = 1;
@@ -1273,11 +1239,10 @@ public java.lang.String getStringElements(int index) {
        */
       public Builder setStringElements(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureStringElementsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureStringElementsIsMutable();
         stringElements_.set(index, value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1288,11 +1253,10 @@ public Builder setStringElements(
        */
       public Builder addStringElements(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureStringElementsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureStringElementsIsMutable();
         stringElements_.add(value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1306,6 +1270,7 @@ public Builder addAllStringElements(
         ensureStringElementsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, stringElements_);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1314,8 +1279,9 @@ public Builder addAllStringElements(
        * @return This builder for chaining.
        */
       public Builder clearStringElements() {
-        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        stringElements_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);;
         onChanged();
         return this;
       }
@@ -1326,21 +1292,20 @@ public Builder clearStringElements() {
        */
       public Builder addStringElementsBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureStringElementsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureStringElementsIsMutable();
         stringElements_.add(value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
 
       private org.apache.pekko.protobufv3.internal.Internal.IntList intElements_ = emptyIntList();
       private void ensureIntElementsIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          intElements_ = mutableCopy(intElements_);
-          bitField0_ |= 0x00000002;
-         }
+        if (!intElements_.isModifiable()) {
+          intElements_ = makeMutableCopy(intElements_);
+        }
+        bitField0_ |= 0x00000002;
       }
       /**
        * repeated sint32 intElements = 2 [packed = true];
@@ -1348,8 +1313,8 @@ private void ensureIntElementsIsMutable() {
        */
       public java.util.List
           getIntElementsList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(intElements_) : intElements_;
+        intElements_.makeImmutable();
+        return intElements_;
       }
       /**
        * repeated sint32 intElements = 2 [packed = true];
@@ -1374,8 +1339,10 @@ public int getIntElements(int index) {
        */
       public Builder setIntElements(
           int index, int value) {
+
         ensureIntElementsIsMutable();
         intElements_.setInt(index, value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1385,8 +1352,10 @@ public Builder setIntElements(
        * @return This builder for chaining.
        */
       public Builder addIntElements(int value) {
+
         ensureIntElementsIsMutable();
         intElements_.addInt(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1400,6 +1369,7 @@ public Builder addAllIntElements(
         ensureIntElementsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, intElements_);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1416,10 +1386,10 @@ public Builder clearIntElements() {
 
       private org.apache.pekko.protobufv3.internal.Internal.LongList longElements_ = emptyLongList();
       private void ensureLongElementsIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
-          longElements_ = mutableCopy(longElements_);
-          bitField0_ |= 0x00000004;
-         }
+        if (!longElements_.isModifiable()) {
+          longElements_ = makeMutableCopy(longElements_);
+        }
+        bitField0_ |= 0x00000004;
       }
       /**
        * repeated sint64 longElements = 3 [packed = true];
@@ -1427,8 +1397,8 @@ private void ensureLongElementsIsMutable() {
        */
       public java.util.List
           getLongElementsList() {
-        return ((bitField0_ & 0x00000004) != 0) ?
-                 java.util.Collections.unmodifiableList(longElements_) : longElements_;
+        longElements_.makeImmutable();
+        return longElements_;
       }
       /**
        * repeated sint64 longElements = 3 [packed = true];
@@ -1453,8 +1423,10 @@ public long getLongElements(int index) {
        */
       public Builder setLongElements(
           int index, long value) {
+
         ensureLongElementsIsMutable();
         longElements_.setLong(index, value);
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1464,8 +1436,10 @@ public Builder setLongElements(
        * @return This builder for chaining.
        */
       public Builder addLongElements(long value) {
+
         ensureLongElementsIsMutable();
         longElements_.addLong(value);
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1479,6 +1453,7 @@ public Builder addAllLongElements(
         ensureLongElementsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, longElements_);
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1733,12 +1708,13 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessa
         return otherElementsBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList actorRefElements_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureActorRefElementsIsMutable() {
-        if (!((bitField0_ & 0x00000010) != 0)) {
+        if (!actorRefElements_.isModifiable()) {
           actorRefElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(actorRefElements_);
-          bitField0_ |= 0x00000010;
-         }
+        }
+        bitField0_ |= 0x00000010;
       }
       /**
        * 
@@ -1750,7 +1726,8 @@ private void ensureActorRefElementsIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getActorRefElementsList() {
-        return actorRefElements_.getUnmodifiableView();
+        actorRefElements_.makeImmutable();
+        return actorRefElements_;
       }
       /**
        * 
@@ -1800,11 +1777,10 @@ public java.lang.String getActorRefElements(int index) {
        */
       public Builder setActorRefElements(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureActorRefElementsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureActorRefElementsIsMutable();
         actorRefElements_.set(index, value);
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1819,11 +1795,10 @@ public Builder setActorRefElements(
        */
       public Builder addActorRefElements(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureActorRefElementsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureActorRefElementsIsMutable();
         actorRefElements_.add(value);
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1841,6 +1816,7 @@ public Builder addAllActorRefElements(
         ensureActorRefElementsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, actorRefElements_);
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1853,8 +1829,9 @@ public Builder addAllActorRefElements(
        * @return This builder for chaining.
        */
       public Builder clearActorRefElements() {
-        actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000010);
+        actorRefElements_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000010);;
         onChanged();
         return this;
       }
@@ -1869,11 +1846,10 @@ public Builder clearActorRefElements() {
        */
       public Builder addActorRefElementsBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureActorRefElementsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureActorRefElementsIsMutable();
         actorRefElements_.add(value);
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1910,7 +1886,18 @@ public GSet parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new GSet(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -2100,7 +2087,7 @@ org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBui
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.ORSet}
    */
-  public  static final class ORSet extends
+  public static final class ORSet extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ORSet)
       ORSetOrBuilder {
@@ -2111,11 +2098,13 @@ private ORSet(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
     }
     private ORSet() {
       dots_ = java.util.Collections.emptyList();
-      stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      stringElements_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       intElements_ = emptyIntList();
       longElements_ = emptyLongList();
       otherElements_ = java.util.Collections.emptyList();
-      actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      actorRefElements_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -2125,158 +2114,6 @@ protected java.lang.Object newInstance(
       return new ORSet();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ORSet(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = vvector_.toBuilder();
-              }
-              vvector_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(vvector_);
-                vvector_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                dots_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              dots_.add(
-                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.PARSER, extensionRegistry));
-              break;
-            }
-            case 26: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                stringElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              stringElements_.add(bs);
-              break;
-            }
-            case 32: {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                intElements_ = newIntList();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              intElements_.addInt(input.readSInt32());
-              break;
-            }
-            case 34: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) {
-                intElements_ = newIntList();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                intElements_.addInt(input.readSInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 40: {
-              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
-                longElements_ = newLongList();
-                mutable_bitField0_ |= 0x00000010;
-              }
-              longElements_.addLong(input.readSInt64());
-              break;
-            }
-            case 42: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000010) != 0) && input.getBytesUntilLimit() > 0) {
-                longElements_ = newLongList();
-                mutable_bitField0_ |= 0x00000010;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                longElements_.addLong(input.readSInt64());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 50: {
-              if (!((mutable_bitField0_ & 0x00000020) != 0)) {
-                otherElements_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000020;
-              }
-              otherElements_.add(
-                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry));
-              break;
-            }
-            case 58: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000040) != 0)) {
-                actorRefElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000040;
-              }
-              actorRefElements_.add(bs);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          dots_ = java.util.Collections.unmodifiableList(dots_);
-        }
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          stringElements_ = stringElements_.getUnmodifiableView();
-        }
-        if (((mutable_bitField0_ & 0x00000008) != 0)) {
-          intElements_.makeImmutable(); // C
-        }
-        if (((mutable_bitField0_ & 0x00000010) != 0)) {
-          longElements_.makeImmutable(); // C
-        }
-        if (((mutable_bitField0_ & 0x00000020) != 0)) {
-          otherElements_ = java.util.Collections.unmodifiableList(otherElements_);
-        }
-        if (((mutable_bitField0_ & 0x00000040) != 0)) {
-          actorRefElements_ = actorRefElements_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_ORSet_descriptor;
@@ -2297,6 +2134,7 @@ private ORSet(
      * required .org.apache.pekko.cluster.ddata.VersionVector vvector = 1;
      * @return Whether the vvector field is set.
      */
+    @java.lang.Override
     public boolean hasVvector() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -2304,27 +2142,32 @@ public boolean hasVvector() {
      * required .org.apache.pekko.cluster.ddata.VersionVector vvector = 1;
      * @return The vvector.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getVvector() {
       return vvector_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance() : vvector_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.VersionVector vvector = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getVvectorOrBuilder() {
       return vvector_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance() : vvector_;
     }
 
     public static final int DOTS_FIELD_NUMBER = 2;
+    @SuppressWarnings("serial")
     private java.util.List dots_;
     /**
      * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
      */
+    @java.lang.Override
     public java.util.List getDotsList() {
       return dots_;
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
      */
+    @java.lang.Override
     public java.util.List 
         getDotsOrBuilderList() {
       return dots_;
@@ -2332,25 +2175,30 @@ public java.util.Listrepeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
      */
+    @java.lang.Override
     public int getDotsCount() {
       return dots_.size();
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getDots(int index) {
       return dots_.get(index);
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getDotsOrBuilder(
         int index) {
       return dots_.get(index);
     }
 
     public static final int STRINGELEMENTS_FIELD_NUMBER = 3;
-    private org.apache.pekko.protobufv3.internal.LazyStringList stringElements_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList stringElements_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string stringElements = 3;
      * @return A list containing the stringElements.
@@ -2385,11 +2233,14 @@ public java.lang.String getStringElements(int index) {
     }
 
     public static final int INTELEMENTS_FIELD_NUMBER = 4;
-    private org.apache.pekko.protobufv3.internal.Internal.IntList intElements_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.Internal.IntList intElements_ =
+        emptyIntList();
     /**
      * repeated sint32 intElements = 4 [packed = true];
      * @return A list containing the intElements.
      */
+    @java.lang.Override
     public java.util.List
         getIntElementsList() {
       return intElements_;
@@ -2412,11 +2263,14 @@ public int getIntElements(int index) {
     private int intElementsMemoizedSerializedSize = -1;
 
     public static final int LONGELEMENTS_FIELD_NUMBER = 5;
-    private org.apache.pekko.protobufv3.internal.Internal.LongList longElements_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.Internal.LongList longElements_ =
+        emptyLongList();
     /**
      * repeated sint64 longElements = 5 [packed = true];
      * @return A list containing the longElements.
      */
+    @java.lang.Override
     public java.util.List
         getLongElementsList() {
       return longElements_;
@@ -2439,16 +2293,19 @@ public long getLongElements(int index) {
     private int longElementsMemoizedSerializedSize = -1;
 
     public static final int OTHERELEMENTS_FIELD_NUMBER = 6;
+    @SuppressWarnings("serial")
     private java.util.List otherElements_;
     /**
      * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
      */
+    @java.lang.Override
     public java.util.List getOtherElementsList() {
       return otherElements_;
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
      */
+    @java.lang.Override
     public java.util.List 
         getOtherElementsOrBuilderList() {
       return otherElements_;
@@ -2456,25 +2313,30 @@ public java.util.Listrepeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
      */
+    @java.lang.Override
     public int getOtherElementsCount() {
       return otherElements_.size();
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherElements(int index) {
       return otherElements_.get(index);
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherElementsOrBuilder(
         int index) {
       return otherElements_.get(index);
     }
 
     public static final int ACTORREFELEMENTS_FIELD_NUMBER = 7;
-    private org.apache.pekko.protobufv3.internal.LazyStringList actorRefElements_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList actorRefElements_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * 
      * added in Akka 2.5.14
@@ -2588,7 +2450,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < actorRefElements_.size(); i++) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 7, actorRefElements_.getRaw(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -2653,7 +2515,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getActorRefElementsList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2685,7 +2547,7 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getOtherElementsList())) return false;
       if (!getActorRefElementsList()
           .equals(other.getActorRefElementsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -2724,7 +2586,7 @@ public int hashCode() {
         hash = (37 * hash) + ACTORREFELEMENTS_FIELD_NUMBER;
         hash = (53 * hash) + getActorRefElementsList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -2773,11 +2635,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -2860,32 +2724,32 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (vvectorBuilder_ == null) {
-          vvector_ = null;
-        } else {
-          vvectorBuilder_.clear();
+        bitField0_ = 0;
+        vvector_ = null;
+        if (vvectorBuilder_ != null) {
+          vvectorBuilder_.dispose();
+          vvectorBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         if (dotsBuilder_ == null) {
           dots_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
+          dots_ = null;
           dotsBuilder_.clear();
         }
-        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000002);
+        stringElements_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         intElements_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000008);
         longElements_ = emptyLongList();
-        bitField0_ = (bitField0_ & ~0x00000010);
         if (otherElementsBuilder_ == null) {
           otherElements_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000020);
         } else {
+          otherElements_ = null;
           otherElementsBuilder_.clear();
         }
-        actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000040);
+        bitField0_ = (bitField0_ & ~0x00000020);
+        actorRefElements_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         return this;
       }
 
@@ -2912,16 +2776,13 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (vvectorBuilder_ == null) {
-            result.vvector_ = vvector_;
-          } else {
-            result.vvector_ = vvectorBuilder_.build();
-          }
-          to_bitField0_ |= 0x00000001;
-        }
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet result) {
         if (dotsBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
             dots_ = java.util.Collections.unmodifiableList(dots_);
@@ -2931,21 +2792,6 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet
         } else {
           result.dots_ = dotsBuilder_.build();
         }
-        if (((bitField0_ & 0x00000004) != 0)) {
-          stringElements_ = stringElements_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000004);
-        }
-        result.stringElements_ = stringElements_;
-        if (((bitField0_ & 0x00000008) != 0)) {
-          intElements_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000008);
-        }
-        result.intElements_ = intElements_;
-        if (((bitField0_ & 0x00000010) != 0)) {
-          longElements_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000010);
-        }
-        result.longElements_ = longElements_;
         if (otherElementsBuilder_ == null) {
           if (((bitField0_ & 0x00000020) != 0)) {
             otherElements_ = java.util.Collections.unmodifiableList(otherElements_);
@@ -2955,14 +2801,34 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet
         } else {
           result.otherElements_ = otherElementsBuilder_.build();
         }
-        if (((bitField0_ & 0x00000040) != 0)) {
-          actorRefElements_ = actorRefElements_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000040);
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.vvector_ = vvectorBuilder_ == null
+              ? vvector_
+              : vvectorBuilder_.build();
+          to_bitField0_ |= 0x00000001;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          stringElements_.makeImmutable();
+          result.stringElements_ = stringElements_;
         }
-        result.actorRefElements_ = actorRefElements_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          intElements_.makeImmutable();
+          result.intElements_ = intElements_;
+        }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          longElements_.makeImmutable();
+          result.longElements_ = longElements_;
+        }
+        if (((from_bitField0_ & 0x00000040) != 0)) {
+          actorRefElements_.makeImmutable();
+          result.actorRefElements_ = actorRefElements_;
+        }
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -3041,7 +2907,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
         if (!other.stringElements_.isEmpty()) {
           if (stringElements_.isEmpty()) {
             stringElements_ = other.stringElements_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ |= 0x00000004;
           } else {
             ensureStringElementsIsMutable();
             stringElements_.addAll(other.stringElements_);
@@ -3051,7 +2917,8 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
         if (!other.intElements_.isEmpty()) {
           if (intElements_.isEmpty()) {
             intElements_ = other.intElements_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            intElements_.makeImmutable();
+            bitField0_ |= 0x00000008;
           } else {
             ensureIntElementsIsMutable();
             intElements_.addAll(other.intElements_);
@@ -3061,7 +2928,8 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
         if (!other.longElements_.isEmpty()) {
           if (longElements_.isEmpty()) {
             longElements_ = other.longElements_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            longElements_.makeImmutable();
+            bitField0_ |= 0x00000010;
           } else {
             ensureLongElementsIsMutable();
             longElements_.addAll(other.longElements_);
@@ -3097,14 +2965,14 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
         if (!other.actorRefElements_.isEmpty()) {
           if (actorRefElements_.isEmpty()) {
             actorRefElements_ = other.actorRefElements_;
-            bitField0_ = (bitField0_ & ~0x00000040);
+            bitField0_ |= 0x00000040;
           } else {
             ensureActorRefElementsIsMutable();
             actorRefElements_.addAll(other.actorRefElements_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -3135,17 +3003,107 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getVvectorFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.PARSER,
+                        extensionRegistry);
+                if (dotsBuilder_ == null) {
+                  ensureDotsIsMutable();
+                  dots_.add(m);
+                } else {
+                  dotsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 18
+              case 26: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureStringElementsIsMutable();
+                stringElements_.add(bs);
+                break;
+              } // case 26
+              case 32: {
+                int v = input.readSInt32();
+                ensureIntElementsIsMutable();
+                intElements_.addInt(v);
+                break;
+              } // case 32
+              case 34: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureIntElementsIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  intElements_.addInt(input.readSInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 34
+              case 40: {
+                long v = input.readSInt64();
+                ensureLongElementsIsMutable();
+                longElements_.addLong(v);
+                break;
+              } // case 40
+              case 42: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureLongElementsIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  longElements_.addLong(input.readSInt64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 42
+              case 50: {
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER,
+                        extensionRegistry);
+                if (otherElementsBuilder_ == null) {
+                  ensureOtherElementsIsMutable();
+                  otherElements_.add(m);
+                } else {
+                  otherElementsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 50
+              case 58: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureActorRefElementsIsMutable();
+                actorRefElements_.add(bs);
+                break;
+              } // case 58
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -3180,11 +3138,11 @@ public Builder setVvector(org.apache.pekko.cluster.ddata.protobuf.msg.Replicator
             throw new NullPointerException();
           }
           vvector_ = value;
-          onChanged();
         } else {
           vvectorBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -3194,11 +3152,11 @@ public Builder setVvector(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder builderForValue) {
         if (vvectorBuilder_ == null) {
           vvector_ = builderForValue.build();
-          onChanged();
         } else {
           vvectorBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -3207,31 +3165,32 @@ public Builder setVvector(
       public Builder mergeVvector(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector value) {
         if (vvectorBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              vvector_ != null &&
-              vvector_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance()) {
-            vvector_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.newBuilder(vvector_).mergeFrom(value).buildPartial();
+            vvector_ != null &&
+            vvector_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance()) {
+            getVvectorBuilder().mergeFrom(value);
           } else {
             vvector_ = value;
           }
-          onChanged();
         } else {
           vvectorBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (vvector_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.VersionVector vvector = 1;
        */
       public Builder clearVvector() {
-        if (vvectorBuilder_ == null) {
-          vvector_ = null;
-          onChanged();
-        } else {
-          vvectorBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        vvector_ = null;
+        if (vvectorBuilder_ != null) {
+          vvectorBuilder_.dispose();
+          vvectorBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -3510,12 +3469,13 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVec
         return dotsBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList stringElements_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureStringElementsIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
+        if (!stringElements_.isModifiable()) {
           stringElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(stringElements_);
-          bitField0_ |= 0x00000004;
-         }
+        }
+        bitField0_ |= 0x00000004;
       }
       /**
        * repeated string stringElements = 3;
@@ -3523,7 +3483,8 @@ private void ensureStringElementsIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getStringElementsList() {
-        return stringElements_.getUnmodifiableView();
+        stringElements_.makeImmutable();
+        return stringElements_;
       }
       /**
        * repeated string stringElements = 3;
@@ -3557,11 +3518,10 @@ public java.lang.String getStringElements(int index) {
        */
       public Builder setStringElements(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureStringElementsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureStringElementsIsMutable();
         stringElements_.set(index, value);
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -3572,11 +3532,10 @@ public Builder setStringElements(
        */
       public Builder addStringElements(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureStringElementsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureStringElementsIsMutable();
         stringElements_.add(value);
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -3590,6 +3549,7 @@ public Builder addAllStringElements(
         ensureStringElementsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, stringElements_);
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -3598,8 +3558,9 @@ public Builder addAllStringElements(
        * @return This builder for chaining.
        */
       public Builder clearStringElements() {
-        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        stringElements_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000004);;
         onChanged();
         return this;
       }
@@ -3610,21 +3571,20 @@ public Builder clearStringElements() {
        */
       public Builder addStringElementsBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureStringElementsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureStringElementsIsMutable();
         stringElements_.add(value);
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
 
       private org.apache.pekko.protobufv3.internal.Internal.IntList intElements_ = emptyIntList();
       private void ensureIntElementsIsMutable() {
-        if (!((bitField0_ & 0x00000008) != 0)) {
-          intElements_ = mutableCopy(intElements_);
-          bitField0_ |= 0x00000008;
-         }
+        if (!intElements_.isModifiable()) {
+          intElements_ = makeMutableCopy(intElements_);
+        }
+        bitField0_ |= 0x00000008;
       }
       /**
        * repeated sint32 intElements = 4 [packed = true];
@@ -3632,8 +3592,8 @@ private void ensureIntElementsIsMutable() {
        */
       public java.util.List
           getIntElementsList() {
-        return ((bitField0_ & 0x00000008) != 0) ?
-                 java.util.Collections.unmodifiableList(intElements_) : intElements_;
+        intElements_.makeImmutable();
+        return intElements_;
       }
       /**
        * repeated sint32 intElements = 4 [packed = true];
@@ -3658,8 +3618,10 @@ public int getIntElements(int index) {
        */
       public Builder setIntElements(
           int index, int value) {
+
         ensureIntElementsIsMutable();
         intElements_.setInt(index, value);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -3669,8 +3631,10 @@ public Builder setIntElements(
        * @return This builder for chaining.
        */
       public Builder addIntElements(int value) {
+
         ensureIntElementsIsMutable();
         intElements_.addInt(value);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -3684,6 +3648,7 @@ public Builder addAllIntElements(
         ensureIntElementsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, intElements_);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -3700,10 +3665,10 @@ public Builder clearIntElements() {
 
       private org.apache.pekko.protobufv3.internal.Internal.LongList longElements_ = emptyLongList();
       private void ensureLongElementsIsMutable() {
-        if (!((bitField0_ & 0x00000010) != 0)) {
-          longElements_ = mutableCopy(longElements_);
-          bitField0_ |= 0x00000010;
-         }
+        if (!longElements_.isModifiable()) {
+          longElements_ = makeMutableCopy(longElements_);
+        }
+        bitField0_ |= 0x00000010;
       }
       /**
        * repeated sint64 longElements = 5 [packed = true];
@@ -3711,8 +3676,8 @@ private void ensureLongElementsIsMutable() {
        */
       public java.util.List
           getLongElementsList() {
-        return ((bitField0_ & 0x00000010) != 0) ?
-                 java.util.Collections.unmodifiableList(longElements_) : longElements_;
+        longElements_.makeImmutable();
+        return longElements_;
       }
       /**
        * repeated sint64 longElements = 5 [packed = true];
@@ -3737,8 +3702,10 @@ public long getLongElements(int index) {
        */
       public Builder setLongElements(
           int index, long value) {
+
         ensureLongElementsIsMutable();
         longElements_.setLong(index, value);
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -3748,8 +3715,10 @@ public Builder setLongElements(
        * @return This builder for chaining.
        */
       public Builder addLongElements(long value) {
+
         ensureLongElementsIsMutable();
         longElements_.addLong(value);
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -3763,6 +3732,7 @@ public Builder addAllLongElements(
         ensureLongElementsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, longElements_);
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -4017,12 +3987,13 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessa
         return otherElementsBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList actorRefElements_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureActorRefElementsIsMutable() {
-        if (!((bitField0_ & 0x00000040) != 0)) {
+        if (!actorRefElements_.isModifiable()) {
           actorRefElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(actorRefElements_);
-          bitField0_ |= 0x00000040;
-         }
+        }
+        bitField0_ |= 0x00000040;
       }
       /**
        * 
@@ -4034,7 +4005,8 @@ private void ensureActorRefElementsIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getActorRefElementsList() {
-        return actorRefElements_.getUnmodifiableView();
+        actorRefElements_.makeImmutable();
+        return actorRefElements_;
       }
       /**
        * 
@@ -4084,11 +4056,10 @@ public java.lang.String getActorRefElements(int index) {
        */
       public Builder setActorRefElements(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureActorRefElementsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureActorRefElementsIsMutable();
         actorRefElements_.set(index, value);
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -4103,11 +4074,10 @@ public Builder setActorRefElements(
        */
       public Builder addActorRefElements(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureActorRefElementsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureActorRefElementsIsMutable();
         actorRefElements_.add(value);
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -4125,6 +4095,7 @@ public Builder addAllActorRefElements(
         ensureActorRefElementsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, actorRefElements_);
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -4137,8 +4108,9 @@ public Builder addAllActorRefElements(
        * @return This builder for chaining.
        */
       public Builder clearActorRefElements() {
-        actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000040);
+        actorRefElements_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000040);;
         onChanged();
         return this;
       }
@@ -4153,11 +4125,10 @@ public Builder clearActorRefElements() {
        */
       public Builder addActorRefElementsBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureActorRefElementsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureActorRefElementsIsMutable();
         actorRefElements_.add(value);
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -4194,7 +4165,18 @@ public ORSet parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ORSet(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -4245,7 +4227,7 @@ org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGro
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.ORSetDeltaGroup}
    */
-  public  static final class ORSetDeltaGroup extends
+  public static final class ORSetDeltaGroup extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ORSetDeltaGroup)
       ORSetDeltaGroupOrBuilder {
@@ -4265,61 +4247,6 @@ protected java.lang.Object newInstance(
       return new ORSetDeltaGroup();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ORSetDeltaGroup(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                entries_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              entries_.add(
-                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          entries_ = java.util.Collections.unmodifiableList(entries_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_ORSetDeltaGroup_descriptor;
@@ -4366,7 +4293,7 @@ public interface EntryOrBuilder extends
     /**
      * Protobuf type {@code org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry}
      */
-    public  static final class Entry extends
+    public static final class Entry extends
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry)
         EntryOrBuilder {
@@ -4386,74 +4313,6 @@ protected java.lang.Object newInstance(
         return new Entry();
       }
 
-      @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private Entry(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 8: {
-                int rawValue = input.readEnum();
-                  @SuppressWarnings("deprecation")
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp value = org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp.valueOf(rawValue);
-                if (value == null) {
-                  unknownFields.mergeVarintField(1, rawValue);
-                } else {
-                  bitField0_ |= 0x00000001;
-                  operation_ = rawValue;
-                }
-                break;
-              }
-              case 18: {
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000002) != 0)) {
-                  subBuilder = underlying_.toBuilder();
-                }
-                underlying_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(underlying_);
-                  underlying_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000002;
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_ORSetDeltaGroup_Entry_descriptor;
@@ -4469,21 +4328,20 @@ private Entry(
 
       private int bitField0_;
       public static final int OPERATION_FIELD_NUMBER = 1;
-      private int operation_;
+      private int operation_ = 0;
       /**
        * required .org.apache.pekko.cluster.ddata.ORSetDeltaOp operation = 1;
        * @return Whether the operation field is set.
        */
-      public boolean hasOperation() {
+      @java.lang.Override public boolean hasOperation() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        * required .org.apache.pekko.cluster.ddata.ORSetDeltaOp operation = 1;
        * @return The operation.
        */
-      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp getOperation() {
-        @SuppressWarnings("deprecation")
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp result = org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp.valueOf(operation_);
+      @java.lang.Override public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp getOperation() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp result = org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp.forNumber(operation_);
         return result == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp.Add : result;
       }
 
@@ -4493,6 +4351,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetD
        * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
        * @return Whether the underlying field is set.
        */
+      @java.lang.Override
       public boolean hasUnderlying() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -4500,12 +4359,14 @@ public boolean hasUnderlying() {
        * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
        * @return The underlying.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getUnderlying() {
         return underlying_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : underlying_;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getUnderlyingOrBuilder() {
         return underlying_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : underlying_;
       }
@@ -4542,7 +4403,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeMessage(2, getUnderlying());
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -4559,7 +4420,7 @@ public int getSerializedSize() {
           size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(2, getUnderlying());
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -4583,7 +4444,7 @@ public boolean equals(final java.lang.Object obj) {
           if (!getUnderlying()
               .equals(other.getUnderlying())) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -4602,7 +4463,7 @@ public int hashCode() {
           hash = (37 * hash) + UNDERLYING_FIELD_NUMBER;
           hash = (53 * hash) + getUnderlying().hashCode();
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -4651,11 +4512,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseDelimitedFrom(
           java.io.InputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -4736,14 +4599,13 @@ private void maybeForceBuilderInitialization() {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           operation_ = 0;
-          bitField0_ = (bitField0_ & ~0x00000001);
-          if (underlyingBuilder_ == null) {
-            underlying_ = null;
-          } else {
-            underlyingBuilder_.clear();
+          underlying_ = null;
+          if (underlyingBuilder_ != null) {
+            underlyingBuilder_.dispose();
+            underlyingBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
@@ -4770,23 +4632,25 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetD
         @java.lang.Override
         public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry buildPartial() {
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.operation_ = operation_;
             to_bitField0_ |= 0x00000001;
           }
-          result.operation_ = operation_;
           if (((from_bitField0_ & 0x00000002) != 0)) {
-            if (underlyingBuilder_ == null) {
-              result.underlying_ = underlying_;
-            } else {
-              result.underlying_ = underlyingBuilder_.build();
-            }
+            result.underlying_ = underlyingBuilder_ == null
+                ? underlying_
+                : underlyingBuilder_.build();
             to_bitField0_ |= 0x00000002;
           }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -4839,7 +4703,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
           if (other.hasUnderlying()) {
             mergeUnderlying(other.getUnderlying());
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -4863,17 +4727,49 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 8: {
+                  int tmpRaw = input.readEnum();
+                  org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp tmpValue =
+                      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp.forNumber(tmpRaw);
+                  if (tmpValue == null) {
+                    mergeUnknownVarintField(1, tmpRaw);
+                  } else {
+                    operation_ = tmpRaw;
+                    bitField0_ |= 0x00000001;
+                  }
+                  break;
+                } // case 8
+                case 18: {
+                  input.readMessage(
+                      getUnderlyingFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
         private int bitField0_;
@@ -4883,16 +4779,16 @@ public Builder mergeFrom(
          * required .org.apache.pekko.cluster.ddata.ORSetDeltaOp operation = 1;
          * @return Whether the operation field is set.
          */
-        public boolean hasOperation() {
+        @java.lang.Override public boolean hasOperation() {
           return ((bitField0_ & 0x00000001) != 0);
         }
         /**
          * required .org.apache.pekko.cluster.ddata.ORSetDeltaOp operation = 1;
          * @return The operation.
          */
+        @java.lang.Override
         public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp getOperation() {
-          @SuppressWarnings("deprecation")
-          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp result = org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp.valueOf(operation_);
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp result = org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp.forNumber(operation_);
           return result == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp.Add : result;
         }
         /**
@@ -4950,11 +4846,11 @@ public Builder setUnderlying(org.apache.pekko.cluster.ddata.protobuf.msg.Replica
               throw new NullPointerException();
             }
             underlying_ = value;
-            onChanged();
           } else {
             underlyingBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /**
@@ -4964,11 +4860,11 @@ public Builder setUnderlying(
             org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
           if (underlyingBuilder_ == null) {
             underlying_ = builderForValue.build();
-            onChanged();
           } else {
             underlyingBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /**
@@ -4977,31 +4873,32 @@ public Builder setUnderlying(
         public Builder mergeUnderlying(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
           if (underlyingBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
-                underlying_ != null &&
-                underlying_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
-              underlying_ =
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(underlying_).mergeFrom(value).buildPartial();
+              underlying_ != null &&
+              underlying_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
+              getUnderlyingBuilder().mergeFrom(value);
             } else {
               underlying_ = value;
             }
-            onChanged();
           } else {
             underlyingBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000002;
+          if (underlying_ != null) {
+            bitField0_ |= 0x00000002;
+            onChanged();
+          }
           return this;
         }
         /**
          * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
          */
         public Builder clearUnderlying() {
-          if (underlyingBuilder_ == null) {
-            underlying_ = null;
-            onChanged();
-          } else {
-            underlyingBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000002);
+          underlying_ = null;
+          if (underlyingBuilder_ != null) {
+            underlyingBuilder_.dispose();
+            underlyingBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -5072,7 +4969,18 @@ public Entry parsePartialFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-          return new Entry(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
@@ -5093,16 +5001,19 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetD
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 1;
+    @SuppressWarnings("serial")
     private java.util.List entries_;
     /**
      * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
      */
+    @java.lang.Override
     public java.util.List getEntriesList() {
       return entries_;
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
      */
+    @java.lang.Override
     public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
@@ -5110,18 +5021,21 @@ public java.util.Listrepeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
      */
+    @java.lang.Override
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
@@ -5150,7 +5064,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < entries_.size(); i++) {
         output.writeMessage(1, entries_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -5163,7 +5077,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, entries_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5180,7 +5094,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getEntriesList()
           .equals(other.getEntriesList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -5195,7 +5109,7 @@ public int hashCode() {
         hash = (37 * hash) + ENTRIES_FIELD_NUMBER;
         hash = (53 * hash) + getEntriesList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -5244,11 +5158,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -5312,29 +5228,25 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getEntriesFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (entriesBuilder_ == null) {
           entries_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
+          entries_ = null;
           entriesBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -5361,7 +5273,13 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetD
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup(this);
-        int from_bitField0_ = bitField0_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup result) {
         if (entriesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             entries_ = java.util.Collections.unmodifiableList(entries_);
@@ -5371,8 +5289,10 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetD
         } else {
           result.entries_ = entriesBuilder_.build();
         }
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup result) {
+        int from_bitField0_ = bitField0_;
       }
 
       @java.lang.Override
@@ -5445,7 +5365,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -5465,17 +5385,43 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.PARSER,
+                        extensionRegistry);
+                if (entriesBuilder_ == null) {
+                  ensureEntriesIsMutable();
+                  entries_.add(m);
+                } else {
+                  entriesBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -5752,7 +5698,18 @@ public ORSetDeltaGroup parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ORSetDeltaGroup(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -5790,7 +5747,7 @@ public interface FlagOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.Flag}
    */
-  public  static final class Flag extends
+  public static final class Flag extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Flag)
       FlagOrBuilder {
@@ -5809,54 +5766,6 @@ protected java.lang.Object newInstance(
       return new Flag();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Flag(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              enabled_ = input.readBool();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_Flag_descriptor;
@@ -5872,11 +5781,12 @@ private Flag(
 
     private int bitField0_;
     public static final int ENABLED_FIELD_NUMBER = 1;
-    private boolean enabled_;
+    private boolean enabled_ = false;
     /**
      * required bool enabled = 1;
      * @return Whether the enabled field is set.
      */
+    @java.lang.Override
     public boolean hasEnabled() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -5884,6 +5794,7 @@ public boolean hasEnabled() {
      * required bool enabled = 1;
      * @return The enabled.
      */
+    @java.lang.Override
     public boolean getEnabled() {
       return enabled_;
     }
@@ -5909,7 +5820,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeBool(1, enabled_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -5922,7 +5833,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(1, enabled_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5942,7 +5853,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getEnabled()
             != other.getEnabled()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -5958,7 +5869,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getEnabled());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -6007,11 +5918,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -6075,24 +5988,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         enabled_ = false;
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -6119,15 +6027,19 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag b
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.enabled_ = enabled_;
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -6177,7 +6089,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
         if (other.hasEnabled()) {
           setEnabled(other.getEnabled());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -6195,17 +6107,35 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                enabled_ = input.readBool();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -6215,6 +6145,7 @@ public Builder mergeFrom(
        * required bool enabled = 1;
        * @return Whether the enabled field is set.
        */
+      @java.lang.Override
       public boolean hasEnabled() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -6222,6 +6153,7 @@ public boolean hasEnabled() {
        * required bool enabled = 1;
        * @return The enabled.
        */
+      @java.lang.Override
       public boolean getEnabled() {
         return enabled_;
       }
@@ -6231,8 +6163,9 @@ public boolean getEnabled() {
        * @return This builder for chaining.
        */
       public Builder setEnabled(boolean value) {
-        bitField0_ |= 0x00000001;
+
         enabled_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -6279,7 +6212,18 @@ public Flag parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Flag(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -6347,7 +6291,7 @@ public interface LWWRegisterOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.LWWRegister}
    */
-  public  static final class LWWRegister extends
+  public static final class LWWRegister extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.LWWRegister)
       LWWRegisterOrBuilder {
@@ -6366,80 +6310,6 @@ protected java.lang.Object newInstance(
       return new LWWRegister();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private LWWRegister(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              timestamp_ = input.readSInt64();
-              break;
-            }
-            case 18: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = node_.toBuilder();
-              }
-              node_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(node_);
-                node_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            case 26: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000004) != 0)) {
-                subBuilder = state_.toBuilder();
-              }
-              state_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(state_);
-                state_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000004;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_LWWRegister_descriptor;
@@ -6455,11 +6325,12 @@ private LWWRegister(
 
     private int bitField0_;
     public static final int TIMESTAMP_FIELD_NUMBER = 1;
-    private long timestamp_;
+    private long timestamp_ = 0L;
     /**
      * required sint64 timestamp = 1;
      * @return Whether the timestamp field is set.
      */
+    @java.lang.Override
     public boolean hasTimestamp() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -6467,6 +6338,7 @@ public boolean hasTimestamp() {
      * required sint64 timestamp = 1;
      * @return The timestamp.
      */
+    @java.lang.Override
     public long getTimestamp() {
       return timestamp_;
     }
@@ -6477,6 +6349,7 @@ public long getTimestamp() {
      * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 2;
      * @return Whether the node field is set.
      */
+    @java.lang.Override
     public boolean hasNode() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -6484,12 +6357,14 @@ public boolean hasNode() {
      * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 2;
      * @return The node.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode() {
       return node_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder() {
       return node_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
     }
@@ -6500,6 +6375,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddr
      * required .org.apache.pekko.cluster.ddata.OtherMessage state = 3;
      * @return Whether the state field is set.
      */
+    @java.lang.Override
     public boolean hasState() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -6507,12 +6383,14 @@ public boolean hasState() {
      * required .org.apache.pekko.cluster.ddata.OtherMessage state = 3;
      * @return The state.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getState() {
       return state_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : state_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.OtherMessage state = 3;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getStateOrBuilder() {
       return state_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : state_;
     }
@@ -6560,7 +6438,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeMessage(3, getState());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -6581,7 +6459,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, getState());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -6611,7 +6489,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getState()
             .equals(other.getState())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -6635,7 +6513,7 @@ public int hashCode() {
         hash = (37 * hash) + STATE_FIELD_NUMBER;
         hash = (53 * hash) + getState().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -6684,11 +6562,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -6770,20 +6650,18 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         timestamp_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (nodeBuilder_ == null) {
-          node_ = null;
-        } else {
-          nodeBuilder_.clear();
+        node_ = null;
+        if (nodeBuilder_ != null) {
+          nodeBuilder_.dispose();
+          nodeBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        if (stateBuilder_ == null) {
-          state_ = null;
-        } else {
-          stateBuilder_.clear();
+        state_ = null;
+        if (stateBuilder_ != null) {
+          stateBuilder_.dispose();
+          stateBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -6810,6 +6688,12 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWReg
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -6817,24 +6701,18 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWReg
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (nodeBuilder_ == null) {
-            result.node_ = node_;
-          } else {
-            result.node_ = nodeBuilder_.build();
-          }
+          result.node_ = nodeBuilder_ == null
+              ? node_
+              : nodeBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
-          if (stateBuilder_ == null) {
-            result.state_ = state_;
-          } else {
-            result.state_ = stateBuilder_.build();
-          }
+          result.state_ = stateBuilder_ == null
+              ? state_
+              : stateBuilder_.build();
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -6890,7 +6768,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
         if (other.hasState()) {
           mergeState(other.getState());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -6920,17 +6798,49 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                timestamp_ = input.readSInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 18: {
+                input.readMessage(
+                    getNodeFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 26: {
+                input.readMessage(
+                    getStateFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -6940,6 +6850,7 @@ public Builder mergeFrom(
        * required sint64 timestamp = 1;
        * @return Whether the timestamp field is set.
        */
+      @java.lang.Override
       public boolean hasTimestamp() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -6947,6 +6858,7 @@ public boolean hasTimestamp() {
        * required sint64 timestamp = 1;
        * @return The timestamp.
        */
+      @java.lang.Override
       public long getTimestamp() {
         return timestamp_;
       }
@@ -6956,8 +6868,9 @@ public long getTimestamp() {
        * @return This builder for chaining.
        */
       public Builder setTimestamp(long value) {
-        bitField0_ |= 0x00000001;
+
         timestamp_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -7002,11 +6915,11 @@ public Builder setNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMes
             throw new NullPointerException();
           }
           node_ = value;
-          onChanged();
         } else {
           nodeBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -7016,11 +6929,11 @@ public Builder setNode(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
         if (nodeBuilder_ == null) {
           node_ = builderForValue.build();
-          onChanged();
         } else {
           nodeBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -7029,31 +6942,32 @@ public Builder setNode(
       public Builder mergeNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
         if (nodeBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              node_ != null &&
-              node_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
-            node_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(node_).mergeFrom(value).buildPartial();
+            node_ != null &&
+            node_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
+            getNodeBuilder().mergeFrom(value);
           } else {
             node_ = value;
           }
-          onChanged();
         } else {
           nodeBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (node_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 2;
        */
       public Builder clearNode() {
-        if (nodeBuilder_ == null) {
-          node_ = null;
-          onChanged();
-        } else {
-          nodeBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        node_ = null;
+        if (nodeBuilder_ != null) {
+          nodeBuilder_.dispose();
+          nodeBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -7122,11 +7036,11 @@ public Builder setState(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMe
             throw new NullPointerException();
           }
           state_ = value;
-          onChanged();
         } else {
           stateBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -7136,11 +7050,11 @@ public Builder setState(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (stateBuilder_ == null) {
           state_ = builderForValue.build();
-          onChanged();
         } else {
           stateBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -7149,31 +7063,32 @@ public Builder setState(
       public Builder mergeState(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (stateBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
-              state_ != null &&
-              state_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-            state_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(state_).mergeFrom(value).buildPartial();
+            state_ != null &&
+            state_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+            getStateBuilder().mergeFrom(value);
           } else {
             state_ = value;
           }
-          onChanged();
         } else {
           stateBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000004;
+        if (state_ != null) {
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.OtherMessage state = 3;
        */
       public Builder clearState() {
-        if (stateBuilder_ == null) {
-          state_ = null;
-          onChanged();
-        } else {
-          stateBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000004);
+        state_ = null;
+        if (stateBuilder_ != null) {
+          stateBuilder_.dispose();
+          stateBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -7244,7 +7159,18 @@ public LWWRegister parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new LWWRegister(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -7295,7 +7221,7 @@ org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entr
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.GCounter}
    */
-  public  static final class GCounter extends
+  public static final class GCounter extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.GCounter)
       GCounterOrBuilder {
@@ -7315,61 +7241,6 @@ protected java.lang.Object newInstance(
       return new GCounter();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private GCounter(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                entries_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              entries_.add(
-                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          entries_ = java.util.Collections.unmodifiableList(entries_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_GCounter_descriptor;
@@ -7416,7 +7287,7 @@ public interface EntryOrBuilder extends
     /**
      * Protobuf type {@code org.apache.pekko.cluster.ddata.GCounter.Entry}
      */
-    public  static final class Entry extends
+    public static final class Entry extends
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.GCounter.Entry)
         EntryOrBuilder {
@@ -7436,78 +7307,17 @@ protected java.lang.Object newInstance(
         return new Entry();
       }
 
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_GCounter_Entry_descriptor;
+      }
+
       @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private Entry(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10: {
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000001) != 0)) {
-                  subBuilder = node_.toBuilder();
-                }
-                node_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(node_);
-                  node_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000001;
-                break;
-              }
-              case 18: {
-                bitField0_ |= 0x00000002;
-                value_ = input.readBytes();
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
-      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
-          getDescriptor() {
-        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_GCounter_Entry_descriptor;
-      }
-
-      @java.lang.Override
-      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_GCounter_Entry_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder.class);
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_GCounter_Entry_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder.class);
       }
 
       private int bitField0_;
@@ -7517,6 +7327,7 @@ private Entry(
        * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
        * @return Whether the node field is set.
        */
+      @java.lang.Override
       public boolean hasNode() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -7524,22 +7335,25 @@ public boolean hasNode() {
        * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
        * @return The node.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode() {
         return node_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder() {
         return node_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
       }
 
       public static final int VALUE_FIELD_NUMBER = 2;
-      private org.apache.pekko.protobufv3.internal.ByteString value_;
+      private org.apache.pekko.protobufv3.internal.ByteString value_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       /**
        * required bytes value = 2;
        * @return Whether the value field is set.
        */
+      @java.lang.Override
       public boolean hasValue() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -7547,6 +7361,7 @@ public boolean hasValue() {
        * required bytes value = 2;
        * @return The value.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getValue() {
         return value_;
       }
@@ -7583,7 +7398,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeBytes(2, value_);
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -7600,7 +7415,7 @@ public int getSerializedSize() {
           size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeBytesSize(2, value_);
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -7625,7 +7440,7 @@ public boolean equals(final java.lang.Object obj) {
           if (!getValue()
               .equals(other.getValue())) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -7644,7 +7459,7 @@ public int hashCode() {
           hash = (37 * hash) + VALUE_FIELD_NUMBER;
           hash = (53 * hash) + getValue().hashCode();
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -7693,11 +7508,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseDelimitedFrom(
           java.io.InputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -7778,14 +7595,13 @@ private void maybeForceBuilderInitialization() {
         @java.lang.Override
         public Builder clear() {
           super.clear();
-          if (nodeBuilder_ == null) {
-            node_ = null;
-          } else {
-            nodeBuilder_.clear();
+          bitField0_ = 0;
+          node_ = null;
+          if (nodeBuilder_ != null) {
+            nodeBuilder_.dispose();
+            nodeBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000001);
           value_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-          bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
@@ -7812,23 +7628,25 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCount
         @java.lang.Override
         public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry buildPartial() {
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
-            if (nodeBuilder_ == null) {
-              result.node_ = node_;
-            } else {
-              result.node_ = nodeBuilder_.build();
-            }
+            result.node_ = nodeBuilder_ == null
+                ? node_
+                : nodeBuilder_.build();
             to_bitField0_ |= 0x00000001;
           }
           if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.value_ = value_;
             to_bitField0_ |= 0x00000002;
           }
-          result.value_ = value_;
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -7881,7 +7699,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
           if (other.hasValue()) {
             setValue(other.getValue());
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -7905,17 +7723,42 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 10: {
+                  input.readMessage(
+                      getNodeFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+                case 18: {
+                  value_ = input.readBytes();
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
         private int bitField0_;
@@ -7950,11 +7793,11 @@ public Builder setNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMes
               throw new NullPointerException();
             }
             node_ = value;
-            onChanged();
           } else {
             nodeBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000001;
+          onChanged();
           return this;
         }
         /**
@@ -7964,11 +7807,11 @@ public Builder setNode(
             org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
           if (nodeBuilder_ == null) {
             node_ = builderForValue.build();
-            onChanged();
           } else {
             nodeBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000001;
+          onChanged();
           return this;
         }
         /**
@@ -7977,31 +7820,32 @@ public Builder setNode(
         public Builder mergeNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
           if (nodeBuilder_ == null) {
             if (((bitField0_ & 0x00000001) != 0) &&
-                node_ != null &&
-                node_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
-              node_ =
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(node_).mergeFrom(value).buildPartial();
+              node_ != null &&
+              node_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
+              getNodeBuilder().mergeFrom(value);
             } else {
               node_ = value;
             }
-            onChanged();
           } else {
             nodeBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000001;
+          if (node_ != null) {
+            bitField0_ |= 0x00000001;
+            onChanged();
+          }
           return this;
         }
         /**
          * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
          */
         public Builder clearNode() {
-          if (nodeBuilder_ == null) {
-            node_ = null;
-            onChanged();
-          } else {
-            nodeBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000001);
+          node_ = null;
+          if (nodeBuilder_ != null) {
+            nodeBuilder_.dispose();
+            nodeBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -8045,6 +7889,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddr
          * required bytes value = 2;
          * @return Whether the value field is set.
          */
+        @java.lang.Override
         public boolean hasValue() {
           return ((bitField0_ & 0x00000002) != 0);
         }
@@ -8052,6 +7897,7 @@ public boolean hasValue() {
          * required bytes value = 2;
          * @return The value.
          */
+        @java.lang.Override
         public org.apache.pekko.protobufv3.internal.ByteString getValue() {
           return value_;
         }
@@ -8061,11 +7907,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getValue() {
          * @return This builder for chaining.
          */
         public Builder setValue(org.apache.pekko.protobufv3.internal.ByteString value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+          if (value == null) { throw new NullPointerException(); }
           value_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -8112,7 +7956,18 @@ public Entry parsePartialFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-          return new Entry(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
@@ -8133,16 +7988,19 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCount
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 1;
+    @SuppressWarnings("serial")
     private java.util.List entries_;
     /**
      * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
      */
+    @java.lang.Override
     public java.util.List getEntriesList() {
       return entries_;
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
      */
+    @java.lang.Override
     public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
@@ -8150,18 +8008,21 @@ public java.util.Listrepeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
      */
+    @java.lang.Override
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
@@ -8190,7 +8051,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < entries_.size(); i++) {
         output.writeMessage(1, entries_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -8203,7 +8064,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, entries_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -8220,7 +8081,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getEntriesList()
           .equals(other.getEntriesList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -8235,7 +8096,7 @@ public int hashCode() {
         hash = (37 * hash) + ENTRIES_FIELD_NUMBER;
         hash = (53 * hash) + getEntriesList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -8284,11 +8145,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -8352,29 +8215,25 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getEntriesFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (entriesBuilder_ == null) {
           entries_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
+          entries_ = null;
           entriesBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -8401,7 +8260,13 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCount
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter(this);
-        int from_bitField0_ = bitField0_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter result) {
         if (entriesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             entries_ = java.util.Collections.unmodifiableList(entries_);
@@ -8411,8 +8276,10 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCount
         } else {
           result.entries_ = entriesBuilder_.build();
         }
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter result) {
+        int from_bitField0_ = bitField0_;
       }
 
       @java.lang.Override
@@ -8485,7 +8352,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -8505,17 +8372,43 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.PARSER,
+                        extensionRegistry);
+                if (entriesBuilder_ == null) {
+                  ensureEntriesIsMutable();
+                  entries_.add(m);
+                } else {
+                  entriesBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -8792,7 +8685,18 @@ public GCounter parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new GCounter(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -8849,7 +8753,7 @@ public interface PNCounterOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.PNCounter}
    */
-  public  static final class PNCounter extends
+  public static final class PNCounter extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.PNCounter)
       PNCounterOrBuilder {
@@ -8868,75 +8772,6 @@ protected java.lang.Object newInstance(
       return new PNCounter();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private PNCounter(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = increments_.toBuilder();
-              }
-              increments_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(increments_);
-                increments_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = decrements_.toBuilder();
-              }
-              decrements_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(decrements_);
-                decrements_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_PNCounter_descriptor;
@@ -8957,6 +8792,7 @@ private PNCounter(
      * required .org.apache.pekko.cluster.ddata.GCounter increments = 1;
      * @return Whether the increments field is set.
      */
+    @java.lang.Override
     public boolean hasIncrements() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -8964,12 +8800,14 @@ public boolean hasIncrements() {
      * required .org.apache.pekko.cluster.ddata.GCounter increments = 1;
      * @return The increments.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter getIncrements() {
       return increments_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance() : increments_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.GCounter increments = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder getIncrementsOrBuilder() {
       return increments_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance() : increments_;
     }
@@ -8980,6 +8818,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCount
      * required .org.apache.pekko.cluster.ddata.GCounter decrements = 2;
      * @return Whether the decrements field is set.
      */
+    @java.lang.Override
     public boolean hasDecrements() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -8987,12 +8826,14 @@ public boolean hasDecrements() {
      * required .org.apache.pekko.cluster.ddata.GCounter decrements = 2;
      * @return The decrements.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter getDecrements() {
       return decrements_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance() : decrements_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.GCounter decrements = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder getDecrementsOrBuilder() {
       return decrements_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance() : decrements_;
     }
@@ -9033,7 +8874,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getDecrements());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -9050,7 +8891,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getDecrements());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -9075,7 +8916,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getDecrements()
             .equals(other.getDecrements())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -9094,7 +8935,7 @@ public int hashCode() {
         hash = (37 * hash) + DECREMENTS_FIELD_NUMBER;
         hash = (53 * hash) + getDecrements().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -9143,11 +8984,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -9229,18 +9072,17 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (incrementsBuilder_ == null) {
-          increments_ = null;
-        } else {
-          incrementsBuilder_.clear();
+        bitField0_ = 0;
+        increments_ = null;
+        if (incrementsBuilder_ != null) {
+          incrementsBuilder_.dispose();
+          incrementsBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (decrementsBuilder_ == null) {
-          decrements_ = null;
-        } else {
-          decrementsBuilder_.clear();
+        decrements_ = null;
+        if (decrementsBuilder_ != null) {
+          decrementsBuilder_.dispose();
+          decrementsBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -9267,27 +9109,27 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCoun
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (incrementsBuilder_ == null) {
-            result.increments_ = increments_;
-          } else {
-            result.increments_ = incrementsBuilder_.build();
-          }
+          result.increments_ = incrementsBuilder_ == null
+              ? increments_
+              : incrementsBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (decrementsBuilder_ == null) {
-            result.decrements_ = decrements_;
-          } else {
-            result.decrements_ = decrementsBuilder_.build();
-          }
+          result.decrements_ = decrementsBuilder_ == null
+              ? decrements_
+              : decrementsBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -9340,7 +9182,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
         if (other.hasDecrements()) {
           mergeDecrements(other.getDecrements());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -9367,17 +9209,44 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getIncrementsFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getDecrementsFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -9412,11 +9281,11 @@ public Builder setIncrements(org.apache.pekko.cluster.ddata.protobuf.msg.Replica
             throw new NullPointerException();
           }
           increments_ = value;
-          onChanged();
         } else {
           incrementsBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -9426,11 +9295,11 @@ public Builder setIncrements(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder builderForValue) {
         if (incrementsBuilder_ == null) {
           increments_ = builderForValue.build();
-          onChanged();
         } else {
           incrementsBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -9439,31 +9308,32 @@ public Builder setIncrements(
       public Builder mergeIncrements(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter value) {
         if (incrementsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              increments_ != null &&
-              increments_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance()) {
-            increments_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.newBuilder(increments_).mergeFrom(value).buildPartial();
+            increments_ != null &&
+            increments_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance()) {
+            getIncrementsBuilder().mergeFrom(value);
           } else {
             increments_ = value;
           }
-          onChanged();
         } else {
           incrementsBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (increments_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.GCounter increments = 1;
        */
       public Builder clearIncrements() {
-        if (incrementsBuilder_ == null) {
-          increments_ = null;
-          onChanged();
-        } else {
-          incrementsBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        increments_ = null;
+        if (incrementsBuilder_ != null) {
+          incrementsBuilder_.dispose();
+          incrementsBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -9532,11 +9402,11 @@ public Builder setDecrements(org.apache.pekko.cluster.ddata.protobuf.msg.Replica
             throw new NullPointerException();
           }
           decrements_ = value;
-          onChanged();
         } else {
           decrementsBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -9546,11 +9416,11 @@ public Builder setDecrements(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder builderForValue) {
         if (decrementsBuilder_ == null) {
           decrements_ = builderForValue.build();
-          onChanged();
         } else {
           decrementsBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -9559,31 +9429,32 @@ public Builder setDecrements(
       public Builder mergeDecrements(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter value) {
         if (decrementsBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              decrements_ != null &&
-              decrements_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance()) {
-            decrements_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.newBuilder(decrements_).mergeFrom(value).buildPartial();
+            decrements_ != null &&
+            decrements_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance()) {
+            getDecrementsBuilder().mergeFrom(value);
           } else {
             decrements_ = value;
           }
-          onChanged();
         } else {
           decrementsBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (decrements_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.GCounter decrements = 2;
        */
       public Builder clearDecrements() {
-        if (decrementsBuilder_ == null) {
-          decrements_ = null;
-          onChanged();
-        } else {
-          decrementsBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        decrements_ = null;
+        if (decrementsBuilder_ != null) {
+          decrementsBuilder_.dispose();
+          decrementsBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -9654,7 +9525,18 @@ public PNCounter parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new PNCounter(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -9720,7 +9602,7 @@ org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.EntryOr
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMap}
    */
-  public  static final class ORMap extends
+  public static final class ORMap extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ORMap)
       ORMapOrBuilder {
@@ -9740,74 +9622,6 @@ protected java.lang.Object newInstance(
       return new ORMap();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ORMap(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = keys_.toBuilder();
-              }
-              keys_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(keys_);
-                keys_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                entries_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              entries_.add(
-                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          entries_ = java.util.Collections.unmodifiableList(entries_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_ORMap_descriptor;
@@ -9897,7 +9711,7 @@ public interface EntryOrBuilder extends
     /**
      * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMap.Entry}
      */
-    public  static final class Entry extends
+    public static final class Entry extends
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ORMap.Entry)
         EntryOrBuilder {
@@ -9917,91 +9731,6 @@ protected java.lang.Object newInstance(
         return new Entry();
       }
 
-      @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private Entry(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10: {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000001;
-                stringKey_ = bs;
-                break;
-              }
-              case 18: {
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000002) != 0)) {
-                  subBuilder = value_.toBuilder();
-                }
-                value_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(value_);
-                  value_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000002;
-                break;
-              }
-              case 24: {
-                bitField0_ |= 0x00000004;
-                intKey_ = input.readSInt32();
-                break;
-              }
-              case 32: {
-                bitField0_ |= 0x00000008;
-                longKey_ = input.readSInt64();
-                break;
-              }
-              case 42: {
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000010) != 0)) {
-                  subBuilder = otherKey_.toBuilder();
-                }
-                otherKey_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(otherKey_);
-                  otherKey_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000010;
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_ORMap_Entry_descriptor;
@@ -10017,11 +9746,13 @@ private Entry(
 
       private int bitField0_;
       public static final int STRINGKEY_FIELD_NUMBER = 1;
-      private volatile java.lang.Object stringKey_;
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object stringKey_ = "";
       /**
        * optional string stringKey = 1;
        * @return Whether the stringKey field is set.
        */
+      @java.lang.Override
       public boolean hasStringKey() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -10029,6 +9760,7 @@ public boolean hasStringKey() {
        * optional string stringKey = 1;
        * @return The stringKey.
        */
+      @java.lang.Override
       public java.lang.String getStringKey() {
         java.lang.Object ref = stringKey_;
         if (ref instanceof java.lang.String) {
@@ -10047,6 +9779,7 @@ public java.lang.String getStringKey() {
        * optional string stringKey = 1;
        * @return The bytes for stringKey.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString
           getStringKeyBytes() {
         java.lang.Object ref = stringKey_;
@@ -10067,6 +9800,7 @@ public java.lang.String getStringKey() {
        * required .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
        * @return Whether the value field is set.
        */
+      @java.lang.Override
       public boolean hasValue() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -10074,22 +9808,25 @@ public boolean hasValue() {
        * required .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
        * @return The value.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getValue() {
         return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : value_;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getValueOrBuilder() {
         return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : value_;
       }
 
       public static final int INTKEY_FIELD_NUMBER = 3;
-      private int intKey_;
+      private int intKey_ = 0;
       /**
        * optional sint32 intKey = 3;
        * @return Whether the intKey field is set.
        */
+      @java.lang.Override
       public boolean hasIntKey() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -10097,16 +9834,18 @@ public boolean hasIntKey() {
        * optional sint32 intKey = 3;
        * @return The intKey.
        */
+      @java.lang.Override
       public int getIntKey() {
         return intKey_;
       }
 
       public static final int LONGKEY_FIELD_NUMBER = 4;
-      private long longKey_;
+      private long longKey_ = 0L;
       /**
        * optional sint64 longKey = 4;
        * @return Whether the longKey field is set.
        */
+      @java.lang.Override
       public boolean hasLongKey() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -10114,6 +9853,7 @@ public boolean hasLongKey() {
        * optional sint64 longKey = 4;
        * @return The longKey.
        */
+      @java.lang.Override
       public long getLongKey() {
         return longKey_;
       }
@@ -10124,6 +9864,7 @@ public long getLongKey() {
        * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return Whether the otherKey field is set.
        */
+      @java.lang.Override
       public boolean hasOtherKey() {
         return ((bitField0_ & 0x00000010) != 0);
       }
@@ -10131,12 +9872,14 @@ public boolean hasOtherKey() {
        * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return The otherKey.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
         return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
       }
       /**
        * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
         return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
       }
@@ -10184,7 +9927,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         if (((bitField0_ & 0x00000010) != 0)) {
           output.writeMessage(5, getOtherKey());
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -10212,7 +9955,7 @@ public int getSerializedSize() {
           size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(5, getOtherKey());
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -10252,7 +9995,7 @@ public boolean equals(final java.lang.Object obj) {
           if (!getOtherKey()
               .equals(other.getOtherKey())) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -10284,7 +10027,7 @@ public int hashCode() {
           hash = (37 * hash) + OTHERKEY_FIELD_NUMBER;
           hash = (53 * hash) + getOtherKey().hashCode();
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -10333,11 +10076,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseDelimitedFrom(
           java.io.InputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -10419,24 +10164,20 @@ private void maybeForceBuilderInitialization() {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           stringKey_ = "";
-          bitField0_ = (bitField0_ & ~0x00000001);
-          if (valueBuilder_ == null) {
-            value_ = null;
-          } else {
-            valueBuilder_.clear();
+          value_ = null;
+          if (valueBuilder_ != null) {
+            valueBuilder_.dispose();
+            valueBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000002);
           intKey_ = 0;
-          bitField0_ = (bitField0_ & ~0x00000004);
           longKey_ = 0L;
-          bitField0_ = (bitField0_ & ~0x00000008);
-          if (otherKeyBuilder_ == null) {
-            otherKey_ = null;
-          } else {
-            otherKeyBuilder_.clear();
+          otherKey_ = null;
+          if (otherKeyBuilder_ != null) {
+            otherKeyBuilder_.dispose();
+            otherKeyBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000010);
           return this;
         }
 
@@ -10463,18 +10204,22 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.
         @java.lang.Override
         public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry buildPartial() {
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.stringKey_ = stringKey_;
             to_bitField0_ |= 0x00000001;
           }
-          result.stringKey_ = stringKey_;
           if (((from_bitField0_ & 0x00000002) != 0)) {
-            if (valueBuilder_ == null) {
-              result.value_ = value_;
-            } else {
-              result.value_ = valueBuilder_.build();
-            }
+            result.value_ = valueBuilder_ == null
+                ? value_
+                : valueBuilder_.build();
             to_bitField0_ |= 0x00000002;
           }
           if (((from_bitField0_ & 0x00000004) != 0)) {
@@ -10486,16 +10231,12 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.
             to_bitField0_ |= 0x00000008;
           }
           if (((from_bitField0_ & 0x00000010) != 0)) {
-            if (otherKeyBuilder_ == null) {
-              result.otherKey_ = otherKey_;
-            } else {
-              result.otherKey_ = otherKeyBuilder_.build();
-            }
+            result.otherKey_ = otherKeyBuilder_ == null
+                ? otherKey_
+                : otherKeyBuilder_.build();
             to_bitField0_ |= 0x00000010;
           }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -10543,8 +10284,8 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
         public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry other) {
           if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.getDefaultInstance()) return this;
           if (other.hasStringKey()) {
-            bitField0_ |= 0x00000001;
             stringKey_ = other.stringKey_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (other.hasValue()) {
@@ -10559,7 +10300,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
           if (other.hasOtherKey()) {
             mergeOtherKey(other.getOtherKey());
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -10585,17 +10326,59 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 10: {
+                  stringKey_ = input.readBytes();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+                case 18: {
+                  input.readMessage(
+                      getValueFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                case 24: {
+                  intKey_ = input.readSInt32();
+                  bitField0_ |= 0x00000004;
+                  break;
+                } // case 24
+                case 32: {
+                  longKey_ = input.readSInt64();
+                  bitField0_ |= 0x00000008;
+                  break;
+                } // case 32
+                case 42: {
+                  input.readMessage(
+                      getOtherKeyFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000010;
+                  break;
+                } // case 42
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
         private int bitField0_;
@@ -10650,11 +10433,9 @@ public java.lang.String getStringKey() {
          */
         public Builder setStringKey(
             java.lang.String value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+          if (value == null) { throw new NullPointerException(); }
           stringKey_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -10663,8 +10444,8 @@ public Builder setStringKey(
          * @return This builder for chaining.
          */
         public Builder clearStringKey() {
-          bitField0_ = (bitField0_ & ~0x00000001);
           stringKey_ = getDefaultInstance().getStringKey();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -10675,11 +10456,9 @@ public Builder clearStringKey() {
          */
         public Builder setStringKeyBytes(
             org.apache.pekko.protobufv3.internal.ByteString value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+          if (value == null) { throw new NullPointerException(); }
           stringKey_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -10714,11 +10493,11 @@ public Builder setValue(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMe
               throw new NullPointerException();
             }
             value_ = value;
-            onChanged();
           } else {
             valueBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /**
@@ -10728,11 +10507,11 @@ public Builder setValue(
             org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
           if (valueBuilder_ == null) {
             value_ = builderForValue.build();
-            onChanged();
           } else {
             valueBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /**
@@ -10741,31 +10520,32 @@ public Builder setValue(
         public Builder mergeValue(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (valueBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
-                value_ != null &&
-                value_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-              value_ =
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(value_).mergeFrom(value).buildPartial();
+              value_ != null &&
+              value_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              getValueBuilder().mergeFrom(value);
             } else {
               value_ = value;
             }
-            onChanged();
           } else {
             valueBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000002;
+          if (value_ != null) {
+            bitField0_ |= 0x00000002;
+            onChanged();
+          }
           return this;
         }
         /**
          * required .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
          */
         public Builder clearValue() {
-          if (valueBuilder_ == null) {
-            value_ = null;
-            onChanged();
-          } else {
-            valueBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000002);
+          value_ = null;
+          if (valueBuilder_ != null) {
+            valueBuilder_.dispose();
+            valueBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -10809,6 +10589,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessa
          * optional sint32 intKey = 3;
          * @return Whether the intKey field is set.
          */
+        @java.lang.Override
         public boolean hasIntKey() {
           return ((bitField0_ & 0x00000004) != 0);
         }
@@ -10816,6 +10597,7 @@ public boolean hasIntKey() {
          * optional sint32 intKey = 3;
          * @return The intKey.
          */
+        @java.lang.Override
         public int getIntKey() {
           return intKey_;
         }
@@ -10825,8 +10607,9 @@ public int getIntKey() {
          * @return This builder for chaining.
          */
         public Builder setIntKey(int value) {
-          bitField0_ |= 0x00000004;
+
           intKey_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -10846,6 +10629,7 @@ public Builder clearIntKey() {
          * optional sint64 longKey = 4;
          * @return Whether the longKey field is set.
          */
+        @java.lang.Override
         public boolean hasLongKey() {
           return ((bitField0_ & 0x00000008) != 0);
         }
@@ -10853,6 +10637,7 @@ public boolean hasLongKey() {
          * optional sint64 longKey = 4;
          * @return The longKey.
          */
+        @java.lang.Override
         public long getLongKey() {
           return longKey_;
         }
@@ -10862,8 +10647,9 @@ public long getLongKey() {
          * @return This builder for chaining.
          */
         public Builder setLongKey(long value) {
-          bitField0_ |= 0x00000008;
+
           longKey_ = value;
+          bitField0_ |= 0x00000008;
           onChanged();
           return this;
         }
@@ -10908,11 +10694,11 @@ public Builder setOtherKey(org.apache.pekko.cluster.ddata.protobuf.msg.Replicato
               throw new NullPointerException();
             }
             otherKey_ = value;
-            onChanged();
           } else {
             otherKeyBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000010;
+          onChanged();
           return this;
         }
         /**
@@ -10922,11 +10708,11 @@ public Builder setOtherKey(
             org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
           if (otherKeyBuilder_ == null) {
             otherKey_ = builderForValue.build();
-            onChanged();
           } else {
             otherKeyBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000010;
+          onChanged();
           return this;
         }
         /**
@@ -10935,31 +10721,32 @@ public Builder setOtherKey(
         public Builder mergeOtherKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (otherKeyBuilder_ == null) {
             if (((bitField0_ & 0x00000010) != 0) &&
-                otherKey_ != null &&
-                otherKey_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-              otherKey_ =
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(otherKey_).mergeFrom(value).buildPartial();
+              otherKey_ != null &&
+              otherKey_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              getOtherKeyBuilder().mergeFrom(value);
             } else {
               otherKey_ = value;
             }
-            onChanged();
           } else {
             otherKeyBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000010;
+          if (otherKey_ != null) {
+            bitField0_ |= 0x00000010;
+            onChanged();
+          }
           return this;
         }
         /**
          * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
         public Builder clearOtherKey() {
-          if (otherKeyBuilder_ == null) {
-            otherKey_ = null;
-            onChanged();
-          } else {
-            otherKeyBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000010);
+          otherKey_ = null;
+          if (otherKeyBuilder_ != null) {
+            otherKeyBuilder_.dispose();
+            otherKeyBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -11030,7 +10817,18 @@ public Entry parsePartialFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-          return new Entry(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
@@ -11057,6 +10855,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.
      * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return Whether the keys field is set.
      */
+    @java.lang.Override
     public boolean hasKeys() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -11064,27 +10863,32 @@ public boolean hasKeys() {
      * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return The keys.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys() {
       return keys_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder() {
       return keys_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 2;
+    @SuppressWarnings("serial")
     private java.util.List entries_;
     /**
      * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
      */
+    @java.lang.Override
     public java.util.List getEntriesList() {
       return entries_;
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
      */
+    @java.lang.Override
     public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
@@ -11092,18 +10896,21 @@ public java.util.Listrepeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
      */
+    @java.lang.Override
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
@@ -11143,7 +10950,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < entries_.size(); i++) {
         output.writeMessage(2, entries_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -11160,7 +10967,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, entries_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -11182,7 +10989,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getEntriesList()
           .equals(other.getEntriesList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -11201,7 +11008,7 @@ public int hashCode() {
         hash = (37 * hash) + ENTRIES_FIELD_NUMBER;
         hash = (53 * hash) + getEntriesList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -11250,11 +11057,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -11336,18 +11145,19 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (keysBuilder_ == null) {
-          keys_ = null;
-        } else {
-          keysBuilder_.clear();
+        bitField0_ = 0;
+        keys_ = null;
+        if (keysBuilder_ != null) {
+          keysBuilder_.dispose();
+          keysBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         if (entriesBuilder_ == null) {
           entries_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
+          entries_ = null;
           entriesBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -11374,16 +11184,13 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (keysBuilder_ == null) {
-            result.keys_ = keys_;
-          } else {
-            result.keys_ = keysBuilder_.build();
-          }
-          to_bitField0_ |= 0x00000001;
-        }
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap result) {
         if (entriesBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
             entries_ = java.util.Collections.unmodifiableList(entries_);
@@ -11393,9 +11200,18 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap
         } else {
           result.entries_ = entriesBuilder_.build();
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.keys_ = keysBuilder_ == null
+              ? keys_
+              : keysBuilder_.build();
+          to_bitField0_ |= 0x00000001;
+        }
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -11471,7 +11287,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -11497,17 +11313,50 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getKeysFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.PARSER,
+                        extensionRegistry);
+                if (entriesBuilder_ == null) {
+                  ensureEntriesIsMutable();
+                  entries_.add(m);
+                } else {
+                  entriesBuilder_.addMessage(m);
+                }
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -11542,11 +11391,11 @@ public Builder setKeys(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDat
             throw new NullPointerException();
           }
           keys_ = value;
-          onChanged();
         } else {
           keysBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -11556,11 +11405,11 @@ public Builder setKeys(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
         if (keysBuilder_ == null) {
           keys_ = builderForValue.build();
-          onChanged();
         } else {
           keysBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -11569,31 +11418,32 @@ public Builder setKeys(
       public Builder mergeKeys(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
         if (keysBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              keys_ != null &&
-              keys_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
-            keys_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(keys_).mergeFrom(value).buildPartial();
+            keys_ != null &&
+            keys_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
+            getKeysBuilder().mergeFrom(value);
           } else {
             keys_ = value;
           }
-          onChanged();
         } else {
           keysBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (keys_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
       public Builder clearKeys() {
-        if (keysBuilder_ == null) {
-          keys_ = null;
-          onChanged();
-        } else {
-          keysBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        keys_ = null;
+        if (keysBuilder_ != null) {
+          keysBuilder_.dispose();
+          keysBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -11904,7 +11754,18 @@ public ORMap parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ORMap(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -11955,7 +11816,7 @@ org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGro
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMapDeltaGroup}
    */
-  public  static final class ORMapDeltaGroup extends
+  public static final class ORMapDeltaGroup extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ORMapDeltaGroup)
       ORMapDeltaGroupOrBuilder {
@@ -11975,61 +11836,6 @@ protected java.lang.Object newInstance(
       return new ORMapDeltaGroup();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ORMapDeltaGroup(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                entries_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              entries_.add(
-                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          entries_ = java.util.Collections.unmodifiableList(entries_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_ORMapDeltaGroup_descriptor;
@@ -12119,7 +11925,7 @@ public interface MapEntryOrBuilder extends
     /**
      * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry}
      */
-    public  static final class MapEntry extends
+    public static final class MapEntry extends
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry)
         MapEntryOrBuilder {
@@ -12139,111 +11945,28 @@ protected java.lang.Object newInstance(
         return new MapEntry();
       }
 
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_ORMapDeltaGroup_MapEntry_descriptor;
+      }
+
       @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private MapEntry(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10: {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000001;
-                stringKey_ = bs;
-                break;
-              }
-              case 18: {
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000002) != 0)) {
-                  subBuilder = value_.toBuilder();
-                }
-                value_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(value_);
-                  value_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000002;
-                break;
-              }
-              case 24: {
-                bitField0_ |= 0x00000004;
-                intKey_ = input.readSInt32();
-                break;
-              }
-              case 32: {
-                bitField0_ |= 0x00000008;
-                longKey_ = input.readSInt64();
-                break;
-              }
-              case 42: {
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000010) != 0)) {
-                  subBuilder = otherKey_.toBuilder();
-                }
-                otherKey_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(otherKey_);
-                  otherKey_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000010;
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
-      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
-          getDescriptor() {
-        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_ORMapDeltaGroup_MapEntry_descriptor;
-      }
-
-      @java.lang.Override
-      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_ORMapDeltaGroup_MapEntry_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder.class);
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_ORMapDeltaGroup_MapEntry_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder.class);
       }
 
       private int bitField0_;
       public static final int STRINGKEY_FIELD_NUMBER = 1;
-      private volatile java.lang.Object stringKey_;
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object stringKey_ = "";
       /**
        * optional string stringKey = 1;
        * @return Whether the stringKey field is set.
        */
+      @java.lang.Override
       public boolean hasStringKey() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -12251,6 +11974,7 @@ public boolean hasStringKey() {
        * optional string stringKey = 1;
        * @return The stringKey.
        */
+      @java.lang.Override
       public java.lang.String getStringKey() {
         java.lang.Object ref = stringKey_;
         if (ref instanceof java.lang.String) {
@@ -12269,6 +11993,7 @@ public java.lang.String getStringKey() {
        * optional string stringKey = 1;
        * @return The bytes for stringKey.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString
           getStringKeyBytes() {
         java.lang.Object ref = stringKey_;
@@ -12289,6 +12014,7 @@ public java.lang.String getStringKey() {
        * optional .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
        * @return Whether the value field is set.
        */
+      @java.lang.Override
       public boolean hasValue() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -12296,22 +12022,25 @@ public boolean hasValue() {
        * optional .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
        * @return The value.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getValue() {
         return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : value_;
       }
       /**
        * optional .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getValueOrBuilder() {
         return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : value_;
       }
 
       public static final int INTKEY_FIELD_NUMBER = 3;
-      private int intKey_;
+      private int intKey_ = 0;
       /**
        * optional sint32 intKey = 3;
        * @return Whether the intKey field is set.
        */
+      @java.lang.Override
       public boolean hasIntKey() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -12319,16 +12048,18 @@ public boolean hasIntKey() {
        * optional sint32 intKey = 3;
        * @return The intKey.
        */
+      @java.lang.Override
       public int getIntKey() {
         return intKey_;
       }
 
       public static final int LONGKEY_FIELD_NUMBER = 4;
-      private long longKey_;
+      private long longKey_ = 0L;
       /**
        * optional sint64 longKey = 4;
        * @return Whether the longKey field is set.
        */
+      @java.lang.Override
       public boolean hasLongKey() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -12336,6 +12067,7 @@ public boolean hasLongKey() {
        * optional sint64 longKey = 4;
        * @return The longKey.
        */
+      @java.lang.Override
       public long getLongKey() {
         return longKey_;
       }
@@ -12346,6 +12078,7 @@ public long getLongKey() {
        * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return Whether the otherKey field is set.
        */
+      @java.lang.Override
       public boolean hasOtherKey() {
         return ((bitField0_ & 0x00000010) != 0);
       }
@@ -12353,12 +12086,14 @@ public boolean hasOtherKey() {
        * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return The otherKey.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
         return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
       }
       /**
        * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
         return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
       }
@@ -12404,7 +12139,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         if (((bitField0_ & 0x00000010) != 0)) {
           output.writeMessage(5, getOtherKey());
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -12432,7 +12167,7 @@ public int getSerializedSize() {
           size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(5, getOtherKey());
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -12472,7 +12207,7 @@ public boolean equals(final java.lang.Object obj) {
           if (!getOtherKey()
               .equals(other.getOtherKey())) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -12504,7 +12239,7 @@ public int hashCode() {
           hash = (37 * hash) + OTHERKEY_FIELD_NUMBER;
           hash = (53 * hash) + getOtherKey().hashCode();
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -12553,11 +12288,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseDelimitedFrom(
           java.io.InputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -12639,24 +12376,20 @@ private void maybeForceBuilderInitialization() {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           stringKey_ = "";
-          bitField0_ = (bitField0_ & ~0x00000001);
-          if (valueBuilder_ == null) {
-            value_ = null;
-          } else {
-            valueBuilder_.clear();
+          value_ = null;
+          if (valueBuilder_ != null) {
+            valueBuilder_.dispose();
+            valueBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000002);
           intKey_ = 0;
-          bitField0_ = (bitField0_ & ~0x00000004);
           longKey_ = 0L;
-          bitField0_ = (bitField0_ & ~0x00000008);
-          if (otherKeyBuilder_ == null) {
-            otherKey_ = null;
-          } else {
-            otherKeyBuilder_.clear();
+          otherKey_ = null;
+          if (otherKeyBuilder_ != null) {
+            otherKeyBuilder_.dispose();
+            otherKeyBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000010);
           return this;
         }
 
@@ -12683,18 +12416,22 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapD
         @java.lang.Override
         public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry buildPartial() {
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.stringKey_ = stringKey_;
             to_bitField0_ |= 0x00000001;
           }
-          result.stringKey_ = stringKey_;
           if (((from_bitField0_ & 0x00000002) != 0)) {
-            if (valueBuilder_ == null) {
-              result.value_ = value_;
-            } else {
-              result.value_ = valueBuilder_.build();
-            }
+            result.value_ = valueBuilder_ == null
+                ? value_
+                : valueBuilder_.build();
             to_bitField0_ |= 0x00000002;
           }
           if (((from_bitField0_ & 0x00000004) != 0)) {
@@ -12706,16 +12443,12 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapD
             to_bitField0_ |= 0x00000008;
           }
           if (((from_bitField0_ & 0x00000010) != 0)) {
-            if (otherKeyBuilder_ == null) {
-              result.otherKey_ = otherKey_;
-            } else {
-              result.otherKey_ = otherKeyBuilder_.build();
-            }
+            result.otherKey_ = otherKeyBuilder_ == null
+                ? otherKey_
+                : otherKeyBuilder_.build();
             to_bitField0_ |= 0x00000010;
           }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -12763,8 +12496,8 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
         public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry other) {
           if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.getDefaultInstance()) return this;
           if (other.hasStringKey()) {
-            bitField0_ |= 0x00000001;
             stringKey_ = other.stringKey_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (other.hasValue()) {
@@ -12779,7 +12512,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
           if (other.hasOtherKey()) {
             mergeOtherKey(other.getOtherKey());
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -12804,17 +12537,59 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 10: {
+                  stringKey_ = input.readBytes();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+                case 18: {
+                  input.readMessage(
+                      getValueFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                case 24: {
+                  intKey_ = input.readSInt32();
+                  bitField0_ |= 0x00000004;
+                  break;
+                } // case 24
+                case 32: {
+                  longKey_ = input.readSInt64();
+                  bitField0_ |= 0x00000008;
+                  break;
+                } // case 32
+                case 42: {
+                  input.readMessage(
+                      getOtherKeyFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000010;
+                  break;
+                } // case 42
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
         private int bitField0_;
@@ -12869,11 +12644,9 @@ public java.lang.String getStringKey() {
          */
         public Builder setStringKey(
             java.lang.String value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+          if (value == null) { throw new NullPointerException(); }
           stringKey_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -12882,8 +12655,8 @@ public Builder setStringKey(
          * @return This builder for chaining.
          */
         public Builder clearStringKey() {
-          bitField0_ = (bitField0_ & ~0x00000001);
           stringKey_ = getDefaultInstance().getStringKey();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -12894,11 +12667,9 @@ public Builder clearStringKey() {
          */
         public Builder setStringKeyBytes(
             org.apache.pekko.protobufv3.internal.ByteString value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+          if (value == null) { throw new NullPointerException(); }
           stringKey_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -12933,11 +12704,11 @@ public Builder setValue(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMe
               throw new NullPointerException();
             }
             value_ = value;
-            onChanged();
           } else {
             valueBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /**
@@ -12947,11 +12718,11 @@ public Builder setValue(
             org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
           if (valueBuilder_ == null) {
             value_ = builderForValue.build();
-            onChanged();
           } else {
             valueBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /**
@@ -12960,31 +12731,32 @@ public Builder setValue(
         public Builder mergeValue(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (valueBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
-                value_ != null &&
-                value_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-              value_ =
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(value_).mergeFrom(value).buildPartial();
+              value_ != null &&
+              value_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              getValueBuilder().mergeFrom(value);
             } else {
               value_ = value;
             }
-            onChanged();
           } else {
             valueBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000002;
+          if (value_ != null) {
+            bitField0_ |= 0x00000002;
+            onChanged();
+          }
           return this;
         }
         /**
          * optional .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
          */
         public Builder clearValue() {
-          if (valueBuilder_ == null) {
-            value_ = null;
-            onChanged();
-          } else {
-            valueBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000002);
+          value_ = null;
+          if (valueBuilder_ != null) {
+            valueBuilder_.dispose();
+            valueBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -13028,6 +12800,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessa
          * optional sint32 intKey = 3;
          * @return Whether the intKey field is set.
          */
+        @java.lang.Override
         public boolean hasIntKey() {
           return ((bitField0_ & 0x00000004) != 0);
         }
@@ -13035,6 +12808,7 @@ public boolean hasIntKey() {
          * optional sint32 intKey = 3;
          * @return The intKey.
          */
+        @java.lang.Override
         public int getIntKey() {
           return intKey_;
         }
@@ -13044,8 +12818,9 @@ public int getIntKey() {
          * @return This builder for chaining.
          */
         public Builder setIntKey(int value) {
-          bitField0_ |= 0x00000004;
+
           intKey_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -13065,6 +12840,7 @@ public Builder clearIntKey() {
          * optional sint64 longKey = 4;
          * @return Whether the longKey field is set.
          */
+        @java.lang.Override
         public boolean hasLongKey() {
           return ((bitField0_ & 0x00000008) != 0);
         }
@@ -13072,6 +12848,7 @@ public boolean hasLongKey() {
          * optional sint64 longKey = 4;
          * @return The longKey.
          */
+        @java.lang.Override
         public long getLongKey() {
           return longKey_;
         }
@@ -13081,8 +12858,9 @@ public long getLongKey() {
          * @return This builder for chaining.
          */
         public Builder setLongKey(long value) {
-          bitField0_ |= 0x00000008;
+
           longKey_ = value;
+          bitField0_ |= 0x00000008;
           onChanged();
           return this;
         }
@@ -13127,11 +12905,11 @@ public Builder setOtherKey(org.apache.pekko.cluster.ddata.protobuf.msg.Replicato
               throw new NullPointerException();
             }
             otherKey_ = value;
-            onChanged();
           } else {
             otherKeyBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000010;
+          onChanged();
           return this;
         }
         /**
@@ -13141,11 +12919,11 @@ public Builder setOtherKey(
             org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
           if (otherKeyBuilder_ == null) {
             otherKey_ = builderForValue.build();
-            onChanged();
           } else {
             otherKeyBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000010;
+          onChanged();
           return this;
         }
         /**
@@ -13154,31 +12932,32 @@ public Builder setOtherKey(
         public Builder mergeOtherKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (otherKeyBuilder_ == null) {
             if (((bitField0_ & 0x00000010) != 0) &&
-                otherKey_ != null &&
-                otherKey_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-              otherKey_ =
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(otherKey_).mergeFrom(value).buildPartial();
+              otherKey_ != null &&
+              otherKey_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              getOtherKeyBuilder().mergeFrom(value);
             } else {
               otherKey_ = value;
             }
-            onChanged();
           } else {
             otherKeyBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000010;
+          if (otherKey_ != null) {
+            bitField0_ |= 0x00000010;
+            onChanged();
+          }
           return this;
         }
         /**
          * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
         public Builder clearOtherKey() {
-          if (otherKeyBuilder_ == null) {
-            otherKey_ = null;
-            onChanged();
-          } else {
-            otherKeyBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000010);
+          otherKey_ = null;
+          if (otherKeyBuilder_ != null) {
+            otherKeyBuilder_.dispose();
+            otherKeyBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -13249,7 +13028,18 @@ public MapEntry parsePartialFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-          return new MapEntry(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
@@ -13337,7 +13127,7 @@ org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGro
     /**
      * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry}
      */
-    public  static final class Entry extends
+    public static final class Entry extends
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry)
         EntryOrBuilder {
@@ -13358,91 +13148,6 @@ protected java.lang.Object newInstance(
         return new Entry();
       }
 
-      @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private Entry(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 8: {
-                int rawValue = input.readEnum();
-                  @SuppressWarnings("deprecation")
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp value = org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp.valueOf(rawValue);
-                if (value == null) {
-                  unknownFields.mergeVarintField(1, rawValue);
-                } else {
-                  bitField0_ |= 0x00000001;
-                  operation_ = rawValue;
-                }
-                break;
-              }
-              case 18: {
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000002) != 0)) {
-                  subBuilder = underlying_.toBuilder();
-                }
-                underlying_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(underlying_);
-                  underlying_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000002;
-                break;
-              }
-              case 24: {
-                bitField0_ |= 0x00000004;
-                zeroTag_ = input.readSInt32();
-                break;
-              }
-              case 34: {
-                if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                  entryData_ = new java.util.ArrayList();
-                  mutable_bitField0_ |= 0x00000008;
-                }
-                entryData_.add(
-                    input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.PARSER, extensionRegistry));
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          if (((mutable_bitField0_ & 0x00000008) != 0)) {
-            entryData_ = java.util.Collections.unmodifiableList(entryData_);
-          }
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_ORMapDeltaGroup_Entry_descriptor;
@@ -13458,21 +13163,20 @@ private Entry(
 
       private int bitField0_;
       public static final int OPERATION_FIELD_NUMBER = 1;
-      private int operation_;
+      private int operation_ = 0;
       /**
        * required .org.apache.pekko.cluster.ddata.ORMapDeltaOp operation = 1;
        * @return Whether the operation field is set.
        */
-      public boolean hasOperation() {
+      @java.lang.Override public boolean hasOperation() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        * required .org.apache.pekko.cluster.ddata.ORMapDeltaOp operation = 1;
        * @return The operation.
        */
-      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp getOperation() {
-        @SuppressWarnings("deprecation")
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp result = org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp.valueOf(operation_);
+      @java.lang.Override public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp getOperation() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp result = org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp.forNumber(operation_);
         return result == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp.ORMapPut : result;
       }
 
@@ -13482,6 +13186,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapD
        * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
        * @return Whether the underlying field is set.
        */
+      @java.lang.Override
       public boolean hasUnderlying() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -13489,22 +13194,25 @@ public boolean hasUnderlying() {
        * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
        * @return The underlying.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getUnderlying() {
         return underlying_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : underlying_;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getUnderlyingOrBuilder() {
         return underlying_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : underlying_;
       }
 
       public static final int ZEROTAG_FIELD_NUMBER = 3;
-      private int zeroTag_;
+      private int zeroTag_ = 0;
       /**
        * required sint32 zeroTag = 3;
        * @return Whether the zeroTag field is set.
        */
+      @java.lang.Override
       public boolean hasZeroTag() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -13512,21 +13220,25 @@ public boolean hasZeroTag() {
        * required sint32 zeroTag = 3;
        * @return The zeroTag.
        */
+      @java.lang.Override
       public int getZeroTag() {
         return zeroTag_;
       }
 
       public static final int ENTRYDATA_FIELD_NUMBER = 4;
+      @SuppressWarnings("serial")
       private java.util.List entryData_;
       /**
        * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
        */
+      @java.lang.Override
       public java.util.List getEntryDataList() {
         return entryData_;
       }
       /**
        * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
        */
+      @java.lang.Override
       public java.util.List 
           getEntryDataOrBuilderList() {
         return entryData_;
@@ -13534,18 +13246,21 @@ public java.util.Listrepeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
        */
+      @java.lang.Override
       public int getEntryDataCount() {
         return entryData_.size();
       }
       /**
        * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry getEntryData(int index) {
         return entryData_.get(index);
       }
       /**
        * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntryOrBuilder getEntryDataOrBuilder(
           int index) {
         return entryData_.get(index);
@@ -13599,7 +13314,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         for (int i = 0; i < entryData_.size(); i++) {
           output.writeMessage(4, entryData_.get(i));
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -13624,7 +13339,7 @@ public int getSerializedSize() {
           size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(4, entryData_.get(i));
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -13655,7 +13370,7 @@ public boolean equals(final java.lang.Object obj) {
         }
         if (!getEntryDataList()
             .equals(other.getEntryDataList())) return false;
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -13682,7 +13397,7 @@ public int hashCode() {
           hash = (37 * hash) + ENTRYDATA_FIELD_NUMBER;
           hash = (53 * hash) + getEntryDataList().hashCode();
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -13731,11 +13446,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseDelimitedFrom(
           java.io.InputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -13817,22 +13534,21 @@ private void maybeForceBuilderInitialization() {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           operation_ = 0;
-          bitField0_ = (bitField0_ & ~0x00000001);
-          if (underlyingBuilder_ == null) {
-            underlying_ = null;
-          } else {
-            underlyingBuilder_.clear();
+          underlying_ = null;
+          if (underlyingBuilder_ != null) {
+            underlyingBuilder_.dispose();
+            underlyingBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000002);
           zeroTag_ = 0;
-          bitField0_ = (bitField0_ & ~0x00000004);
           if (entryDataBuilder_ == null) {
             entryData_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000008);
           } else {
+            entryData_ = null;
             entryDataBuilder_.clear();
           }
+          bitField0_ = (bitField0_ & ~0x00000008);
           return this;
         }
 
@@ -13859,36 +13575,42 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapD
         @java.lang.Override
         public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry buildPartial() {
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry(this);
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry result) {
+          if (entryDataBuilder_ == null) {
+            if (((bitField0_ & 0x00000008) != 0)) {
+              entryData_ = java.util.Collections.unmodifiableList(entryData_);
+              bitField0_ = (bitField0_ & ~0x00000008);
+            }
+            result.entryData_ = entryData_;
+          } else {
+            result.entryData_ = entryDataBuilder_.build();
+          }
+        }
+
+        private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.operation_ = operation_;
             to_bitField0_ |= 0x00000001;
           }
-          result.operation_ = operation_;
           if (((from_bitField0_ & 0x00000002) != 0)) {
-            if (underlyingBuilder_ == null) {
-              result.underlying_ = underlying_;
-            } else {
-              result.underlying_ = underlyingBuilder_.build();
-            }
+            result.underlying_ = underlyingBuilder_ == null
+                ? underlying_
+                : underlyingBuilder_.build();
             to_bitField0_ |= 0x00000002;
           }
           if (((from_bitField0_ & 0x00000004) != 0)) {
             result.zeroTag_ = zeroTag_;
             to_bitField0_ |= 0x00000004;
           }
-          if (entryDataBuilder_ == null) {
-            if (((bitField0_ & 0x00000008) != 0)) {
-              entryData_ = java.util.Collections.unmodifiableList(entryData_);
-              bitField0_ = (bitField0_ & ~0x00000008);
-            }
-            result.entryData_ = entryData_;
-          } else {
-            result.entryData_ = entryDataBuilder_.build();
-          }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -13970,7 +13692,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
               }
             }
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -14002,17 +13724,67 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 8: {
+                  int tmpRaw = input.readEnum();
+                  org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp tmpValue =
+                      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp.forNumber(tmpRaw);
+                  if (tmpValue == null) {
+                    mergeUnknownVarintField(1, tmpRaw);
+                  } else {
+                    operation_ = tmpRaw;
+                    bitField0_ |= 0x00000001;
+                  }
+                  break;
+                } // case 8
+                case 18: {
+                  input.readMessage(
+                      getUnderlyingFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                case 24: {
+                  zeroTag_ = input.readSInt32();
+                  bitField0_ |= 0x00000004;
+                  break;
+                } // case 24
+                case 34: {
+                  org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry m =
+                      input.readMessage(
+                          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.PARSER,
+                          extensionRegistry);
+                  if (entryDataBuilder_ == null) {
+                    ensureEntryDataIsMutable();
+                    entryData_.add(m);
+                  } else {
+                    entryDataBuilder_.addMessage(m);
+                  }
+                  break;
+                } // case 34
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
         private int bitField0_;
@@ -14022,16 +13794,16 @@ public Builder mergeFrom(
          * required .org.apache.pekko.cluster.ddata.ORMapDeltaOp operation = 1;
          * @return Whether the operation field is set.
          */
-        public boolean hasOperation() {
+        @java.lang.Override public boolean hasOperation() {
           return ((bitField0_ & 0x00000001) != 0);
         }
         /**
          * required .org.apache.pekko.cluster.ddata.ORMapDeltaOp operation = 1;
          * @return The operation.
          */
+        @java.lang.Override
         public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp getOperation() {
-          @SuppressWarnings("deprecation")
-          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp result = org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp.valueOf(operation_);
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp result = org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp.forNumber(operation_);
           return result == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp.ORMapPut : result;
         }
         /**
@@ -14089,11 +13861,11 @@ public Builder setUnderlying(org.apache.pekko.cluster.ddata.protobuf.msg.Replica
               throw new NullPointerException();
             }
             underlying_ = value;
-            onChanged();
           } else {
             underlyingBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /**
@@ -14103,11 +13875,11 @@ public Builder setUnderlying(
             org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
           if (underlyingBuilder_ == null) {
             underlying_ = builderForValue.build();
-            onChanged();
           } else {
             underlyingBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /**
@@ -14116,31 +13888,32 @@ public Builder setUnderlying(
         public Builder mergeUnderlying(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
           if (underlyingBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
-                underlying_ != null &&
-                underlying_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
-              underlying_ =
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(underlying_).mergeFrom(value).buildPartial();
+              underlying_ != null &&
+              underlying_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
+              getUnderlyingBuilder().mergeFrom(value);
             } else {
               underlying_ = value;
             }
-            onChanged();
           } else {
             underlyingBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000002;
+          if (underlying_ != null) {
+            bitField0_ |= 0x00000002;
+            onChanged();
+          }
           return this;
         }
         /**
          * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
          */
         public Builder clearUnderlying() {
-          if (underlyingBuilder_ == null) {
-            underlying_ = null;
-            onChanged();
-          } else {
-            underlyingBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000002);
+          underlying_ = null;
+          if (underlyingBuilder_ != null) {
+            underlyingBuilder_.dispose();
+            underlyingBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -14184,6 +13957,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetO
          * required sint32 zeroTag = 3;
          * @return Whether the zeroTag field is set.
          */
+        @java.lang.Override
         public boolean hasZeroTag() {
           return ((bitField0_ & 0x00000004) != 0);
         }
@@ -14191,6 +13965,7 @@ public boolean hasZeroTag() {
          * required sint32 zeroTag = 3;
          * @return The zeroTag.
          */
+        @java.lang.Override
         public int getZeroTag() {
           return zeroTag_;
         }
@@ -14200,8 +13975,9 @@ public int getZeroTag() {
          * @return This builder for chaining.
          */
         public Builder setZeroTag(int value) {
-          bitField0_ |= 0x00000004;
+
           zeroTag_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -14488,7 +14264,18 @@ public Entry parsePartialFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-          return new Entry(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
@@ -14509,16 +14296,19 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapD
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 1;
+    @SuppressWarnings("serial")
     private java.util.List entries_;
     /**
      * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
      */
+    @java.lang.Override
     public java.util.List getEntriesList() {
       return entries_;
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
      */
+    @java.lang.Override
     public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
@@ -14526,18 +14316,21 @@ public java.util.Listrepeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
      */
+    @java.lang.Override
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
@@ -14566,7 +14359,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < entries_.size(); i++) {
         output.writeMessage(1, entries_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -14579,7 +14372,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, entries_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -14596,7 +14389,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getEntriesList()
           .equals(other.getEntriesList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -14611,7 +14404,7 @@ public int hashCode() {
         hash = (37 * hash) + ENTRIES_FIELD_NUMBER;
         hash = (53 * hash) + getEntriesList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -14660,11 +14453,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -14728,29 +14523,25 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getEntriesFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (entriesBuilder_ == null) {
           entries_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
+          entries_ = null;
           entriesBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -14777,7 +14568,13 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapD
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup(this);
-        int from_bitField0_ = bitField0_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup result) {
         if (entriesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             entries_ = java.util.Collections.unmodifiableList(entries_);
@@ -14787,8 +14584,10 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapD
         } else {
           result.entries_ = entriesBuilder_.build();
         }
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup result) {
+        int from_bitField0_ = bitField0_;
       }
 
       @java.lang.Override
@@ -14861,7 +14660,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -14881,17 +14680,43 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.PARSER,
+                        extensionRegistry);
+                if (entriesBuilder_ == null) {
+                  ensureEntriesIsMutable();
+                  entries_.add(m);
+                } else {
+                  entriesBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -15168,7 +14993,18 @@ public ORMapDeltaGroup parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ORMapDeltaGroup(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -15234,7 +15070,7 @@ org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.EntryO
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.LWWMap}
    */
-  public  static final class LWWMap extends
+  public static final class LWWMap extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.LWWMap)
       LWWMapOrBuilder {
@@ -15254,74 +15090,6 @@ protected java.lang.Object newInstance(
       return new LWWMap();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private LWWMap(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = keys_.toBuilder();
-              }
-              keys_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(keys_);
-                keys_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                entries_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              entries_.add(
-                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          entries_ = java.util.Collections.unmodifiableList(entries_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_LWWMap_descriptor;
@@ -15411,7 +15179,7 @@ public interface EntryOrBuilder extends
     /**
      * Protobuf type {@code org.apache.pekko.cluster.ddata.LWWMap.Entry}
      */
-    public  static final class Entry extends
+    public static final class Entry extends
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.LWWMap.Entry)
         EntryOrBuilder {
@@ -15431,91 +15199,6 @@ protected java.lang.Object newInstance(
         return new Entry();
       }
 
-      @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private Entry(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10: {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000001;
-                stringKey_ = bs;
-                break;
-              }
-              case 18: {
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000002) != 0)) {
-                  subBuilder = value_.toBuilder();
-                }
-                value_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(value_);
-                  value_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000002;
-                break;
-              }
-              case 24: {
-                bitField0_ |= 0x00000004;
-                intKey_ = input.readSInt32();
-                break;
-              }
-              case 32: {
-                bitField0_ |= 0x00000008;
-                longKey_ = input.readSInt64();
-                break;
-              }
-              case 42: {
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000010) != 0)) {
-                  subBuilder = otherKey_.toBuilder();
-                }
-                otherKey_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(otherKey_);
-                  otherKey_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000010;
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_LWWMap_Entry_descriptor;
@@ -15531,11 +15214,13 @@ private Entry(
 
       private int bitField0_;
       public static final int STRINGKEY_FIELD_NUMBER = 1;
-      private volatile java.lang.Object stringKey_;
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object stringKey_ = "";
       /**
        * optional string stringKey = 1;
        * @return Whether the stringKey field is set.
        */
+      @java.lang.Override
       public boolean hasStringKey() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -15543,6 +15228,7 @@ public boolean hasStringKey() {
        * optional string stringKey = 1;
        * @return The stringKey.
        */
+      @java.lang.Override
       public java.lang.String getStringKey() {
         java.lang.Object ref = stringKey_;
         if (ref instanceof java.lang.String) {
@@ -15561,6 +15247,7 @@ public java.lang.String getStringKey() {
        * optional string stringKey = 1;
        * @return The bytes for stringKey.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString
           getStringKeyBytes() {
         java.lang.Object ref = stringKey_;
@@ -15581,6 +15268,7 @@ public java.lang.String getStringKey() {
        * required .org.apache.pekko.cluster.ddata.LWWRegister value = 2;
        * @return Whether the value field is set.
        */
+      @java.lang.Override
       public boolean hasValue() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -15588,22 +15276,25 @@ public boolean hasValue() {
        * required .org.apache.pekko.cluster.ddata.LWWRegister value = 2;
        * @return The value.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister getValue() {
         return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.getDefaultInstance() : value_;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.LWWRegister value = 2;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegisterOrBuilder getValueOrBuilder() {
         return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.getDefaultInstance() : value_;
       }
 
       public static final int INTKEY_FIELD_NUMBER = 3;
-      private int intKey_;
+      private int intKey_ = 0;
       /**
        * optional sint32 intKey = 3;
        * @return Whether the intKey field is set.
        */
+      @java.lang.Override
       public boolean hasIntKey() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -15611,16 +15302,18 @@ public boolean hasIntKey() {
        * optional sint32 intKey = 3;
        * @return The intKey.
        */
+      @java.lang.Override
       public int getIntKey() {
         return intKey_;
       }
 
       public static final int LONGKEY_FIELD_NUMBER = 4;
-      private long longKey_;
+      private long longKey_ = 0L;
       /**
        * optional sint64 longKey = 4;
        * @return Whether the longKey field is set.
        */
+      @java.lang.Override
       public boolean hasLongKey() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -15628,6 +15321,7 @@ public boolean hasLongKey() {
        * optional sint64 longKey = 4;
        * @return The longKey.
        */
+      @java.lang.Override
       public long getLongKey() {
         return longKey_;
       }
@@ -15638,6 +15332,7 @@ public long getLongKey() {
        * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return Whether the otherKey field is set.
        */
+      @java.lang.Override
       public boolean hasOtherKey() {
         return ((bitField0_ & 0x00000010) != 0);
       }
@@ -15645,12 +15340,14 @@ public boolean hasOtherKey() {
        * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return The otherKey.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
         return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
       }
       /**
        * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
         return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
       }
@@ -15698,7 +15395,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         if (((bitField0_ & 0x00000010) != 0)) {
           output.writeMessage(5, getOtherKey());
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -15726,7 +15423,7 @@ public int getSerializedSize() {
           size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(5, getOtherKey());
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -15766,7 +15463,7 @@ public boolean equals(final java.lang.Object obj) {
           if (!getOtherKey()
               .equals(other.getOtherKey())) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -15798,7 +15495,7 @@ public int hashCode() {
           hash = (37 * hash) + OTHERKEY_FIELD_NUMBER;
           hash = (53 * hash) + getOtherKey().hashCode();
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -15847,11 +15544,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseDelimitedFrom(
           java.io.InputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -15933,24 +15632,20 @@ private void maybeForceBuilderInitialization() {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           stringKey_ = "";
-          bitField0_ = (bitField0_ & ~0x00000001);
-          if (valueBuilder_ == null) {
-            value_ = null;
-          } else {
-            valueBuilder_.clear();
+          value_ = null;
+          if (valueBuilder_ != null) {
+            valueBuilder_.dispose();
+            valueBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000002);
           intKey_ = 0;
-          bitField0_ = (bitField0_ & ~0x00000004);
           longKey_ = 0L;
-          bitField0_ = (bitField0_ & ~0x00000008);
-          if (otherKeyBuilder_ == null) {
-            otherKey_ = null;
-          } else {
-            otherKeyBuilder_.clear();
+          otherKey_ = null;
+          if (otherKeyBuilder_ != null) {
+            otherKeyBuilder_.dispose();
+            otherKeyBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000010);
           return this;
         }
 
@@ -15977,18 +15672,22 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap
         @java.lang.Override
         public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry buildPartial() {
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.stringKey_ = stringKey_;
             to_bitField0_ |= 0x00000001;
           }
-          result.stringKey_ = stringKey_;
           if (((from_bitField0_ & 0x00000002) != 0)) {
-            if (valueBuilder_ == null) {
-              result.value_ = value_;
-            } else {
-              result.value_ = valueBuilder_.build();
-            }
+            result.value_ = valueBuilder_ == null
+                ? value_
+                : valueBuilder_.build();
             to_bitField0_ |= 0x00000002;
           }
           if (((from_bitField0_ & 0x00000004) != 0)) {
@@ -16000,16 +15699,12 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap
             to_bitField0_ |= 0x00000008;
           }
           if (((from_bitField0_ & 0x00000010) != 0)) {
-            if (otherKeyBuilder_ == null) {
-              result.otherKey_ = otherKey_;
-            } else {
-              result.otherKey_ = otherKeyBuilder_.build();
-            }
+            result.otherKey_ = otherKeyBuilder_ == null
+                ? otherKey_
+                : otherKeyBuilder_.build();
             to_bitField0_ |= 0x00000010;
-          }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          }
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -16057,8 +15752,8 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
         public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry other) {
           if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.getDefaultInstance()) return this;
           if (other.hasStringKey()) {
-            bitField0_ |= 0x00000001;
             stringKey_ = other.stringKey_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (other.hasValue()) {
@@ -16073,7 +15768,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
           if (other.hasOtherKey()) {
             mergeOtherKey(other.getOtherKey());
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -16099,17 +15794,59 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 10: {
+                  stringKey_ = input.readBytes();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+                case 18: {
+                  input.readMessage(
+                      getValueFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                case 24: {
+                  intKey_ = input.readSInt32();
+                  bitField0_ |= 0x00000004;
+                  break;
+                } // case 24
+                case 32: {
+                  longKey_ = input.readSInt64();
+                  bitField0_ |= 0x00000008;
+                  break;
+                } // case 32
+                case 42: {
+                  input.readMessage(
+                      getOtherKeyFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000010;
+                  break;
+                } // case 42
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
         private int bitField0_;
@@ -16164,11 +15901,9 @@ public java.lang.String getStringKey() {
          */
         public Builder setStringKey(
             java.lang.String value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+          if (value == null) { throw new NullPointerException(); }
           stringKey_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -16177,8 +15912,8 @@ public Builder setStringKey(
          * @return This builder for chaining.
          */
         public Builder clearStringKey() {
-          bitField0_ = (bitField0_ & ~0x00000001);
           stringKey_ = getDefaultInstance().getStringKey();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -16189,11 +15924,9 @@ public Builder clearStringKey() {
          */
         public Builder setStringKeyBytes(
             org.apache.pekko.protobufv3.internal.ByteString value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+          if (value == null) { throw new NullPointerException(); }
           stringKey_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -16228,11 +15961,11 @@ public Builder setValue(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDa
               throw new NullPointerException();
             }
             value_ = value;
-            onChanged();
           } else {
             valueBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /**
@@ -16242,11 +15975,11 @@ public Builder setValue(
             org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.Builder builderForValue) {
           if (valueBuilder_ == null) {
             value_ = builderForValue.build();
-            onChanged();
           } else {
             valueBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /**
@@ -16255,31 +15988,32 @@ public Builder setValue(
         public Builder mergeValue(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister value) {
           if (valueBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
-                value_ != null &&
-                value_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.getDefaultInstance()) {
-              value_ =
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.newBuilder(value_).mergeFrom(value).buildPartial();
+              value_ != null &&
+              value_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.getDefaultInstance()) {
+              getValueBuilder().mergeFrom(value);
             } else {
               value_ = value;
             }
-            onChanged();
           } else {
             valueBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000002;
+          if (value_ != null) {
+            bitField0_ |= 0x00000002;
+            onChanged();
+          }
           return this;
         }
         /**
          * required .org.apache.pekko.cluster.ddata.LWWRegister value = 2;
          */
         public Builder clearValue() {
-          if (valueBuilder_ == null) {
-            value_ = null;
-            onChanged();
-          } else {
-            valueBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000002);
+          value_ = null;
+          if (valueBuilder_ != null) {
+            valueBuilder_.dispose();
+            valueBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -16323,6 +16057,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWReg
          * optional sint32 intKey = 3;
          * @return Whether the intKey field is set.
          */
+        @java.lang.Override
         public boolean hasIntKey() {
           return ((bitField0_ & 0x00000004) != 0);
         }
@@ -16330,6 +16065,7 @@ public boolean hasIntKey() {
          * optional sint32 intKey = 3;
          * @return The intKey.
          */
+        @java.lang.Override
         public int getIntKey() {
           return intKey_;
         }
@@ -16339,8 +16075,9 @@ public int getIntKey() {
          * @return This builder for chaining.
          */
         public Builder setIntKey(int value) {
-          bitField0_ |= 0x00000004;
+
           intKey_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -16360,6 +16097,7 @@ public Builder clearIntKey() {
          * optional sint64 longKey = 4;
          * @return Whether the longKey field is set.
          */
+        @java.lang.Override
         public boolean hasLongKey() {
           return ((bitField0_ & 0x00000008) != 0);
         }
@@ -16367,6 +16105,7 @@ public boolean hasLongKey() {
          * optional sint64 longKey = 4;
          * @return The longKey.
          */
+        @java.lang.Override
         public long getLongKey() {
           return longKey_;
         }
@@ -16376,8 +16115,9 @@ public long getLongKey() {
          * @return This builder for chaining.
          */
         public Builder setLongKey(long value) {
-          bitField0_ |= 0x00000008;
+
           longKey_ = value;
+          bitField0_ |= 0x00000008;
           onChanged();
           return this;
         }
@@ -16422,11 +16162,11 @@ public Builder setOtherKey(org.apache.pekko.cluster.ddata.protobuf.msg.Replicato
               throw new NullPointerException();
             }
             otherKey_ = value;
-            onChanged();
           } else {
             otherKeyBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000010;
+          onChanged();
           return this;
         }
         /**
@@ -16436,11 +16176,11 @@ public Builder setOtherKey(
             org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
           if (otherKeyBuilder_ == null) {
             otherKey_ = builderForValue.build();
-            onChanged();
           } else {
             otherKeyBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000010;
+          onChanged();
           return this;
         }
         /**
@@ -16449,31 +16189,32 @@ public Builder setOtherKey(
         public Builder mergeOtherKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (otherKeyBuilder_ == null) {
             if (((bitField0_ & 0x00000010) != 0) &&
-                otherKey_ != null &&
-                otherKey_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-              otherKey_ =
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(otherKey_).mergeFrom(value).buildPartial();
+              otherKey_ != null &&
+              otherKey_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              getOtherKeyBuilder().mergeFrom(value);
             } else {
               otherKey_ = value;
             }
-            onChanged();
           } else {
             otherKeyBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000010;
+          if (otherKey_ != null) {
+            bitField0_ |= 0x00000010;
+            onChanged();
+          }
           return this;
         }
         /**
          * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
         public Builder clearOtherKey() {
-          if (otherKeyBuilder_ == null) {
-            otherKey_ = null;
-            onChanged();
-          } else {
-            otherKeyBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000010);
+          otherKey_ = null;
+          if (otherKeyBuilder_ != null) {
+            otherKeyBuilder_.dispose();
+            otherKeyBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -16544,7 +16285,18 @@ public Entry parsePartialFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-          return new Entry(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
@@ -16571,6 +16323,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap
      * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return Whether the keys field is set.
      */
+    @java.lang.Override
     public boolean hasKeys() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -16578,27 +16331,32 @@ public boolean hasKeys() {
      * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return The keys.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys() {
       return keys_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder() {
       return keys_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 2;
+    @SuppressWarnings("serial")
     private java.util.List entries_;
     /**
      * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
      */
+    @java.lang.Override
     public java.util.List getEntriesList() {
       return entries_;
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
      */
+    @java.lang.Override
     public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
@@ -16606,18 +16364,21 @@ public java.util.Listrepeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
      */
+    @java.lang.Override
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
@@ -16657,7 +16418,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < entries_.size(); i++) {
         output.writeMessage(2, entries_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -16674,7 +16435,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, entries_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -16696,7 +16457,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getEntriesList()
           .equals(other.getEntriesList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -16715,7 +16476,7 @@ public int hashCode() {
         hash = (37 * hash) + ENTRIES_FIELD_NUMBER;
         hash = (53 * hash) + getEntriesList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -16764,11 +16525,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -16850,18 +16613,19 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (keysBuilder_ == null) {
-          keys_ = null;
-        } else {
-          keysBuilder_.clear();
+        bitField0_ = 0;
+        keys_ = null;
+        if (keysBuilder_ != null) {
+          keysBuilder_.dispose();
+          keysBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         if (entriesBuilder_ == null) {
           entries_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
+          entries_ = null;
           entriesBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -16888,16 +16652,13 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (keysBuilder_ == null) {
-            result.keys_ = keys_;
-          } else {
-            result.keys_ = keysBuilder_.build();
-          }
-          to_bitField0_ |= 0x00000001;
-        }
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap result) {
         if (entriesBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
             entries_ = java.util.Collections.unmodifiableList(entries_);
@@ -16907,9 +16668,18 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap
         } else {
           result.entries_ = entriesBuilder_.build();
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.keys_ = keysBuilder_ == null
+              ? keys_
+              : keysBuilder_.build();
+          to_bitField0_ |= 0x00000001;
+        }
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -16985,7 +16755,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -17011,17 +16781,50 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getKeysFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.PARSER,
+                        extensionRegistry);
+                if (entriesBuilder_ == null) {
+                  ensureEntriesIsMutable();
+                  entries_.add(m);
+                } else {
+                  entriesBuilder_.addMessage(m);
+                }
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -17056,11 +16859,11 @@ public Builder setKeys(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDat
             throw new NullPointerException();
           }
           keys_ = value;
-          onChanged();
         } else {
           keysBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -17070,11 +16873,11 @@ public Builder setKeys(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
         if (keysBuilder_ == null) {
           keys_ = builderForValue.build();
-          onChanged();
         } else {
           keysBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -17083,31 +16886,32 @@ public Builder setKeys(
       public Builder mergeKeys(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
         if (keysBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              keys_ != null &&
-              keys_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
-            keys_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(keys_).mergeFrom(value).buildPartial();
+            keys_ != null &&
+            keys_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
+            getKeysBuilder().mergeFrom(value);
           } else {
             keys_ = value;
           }
-          onChanged();
         } else {
           keysBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (keys_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
       public Builder clearKeys() {
-        if (keysBuilder_ == null) {
-          keys_ = null;
-          onChanged();
-        } else {
-          keysBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        keys_ = null;
+        if (keysBuilder_ != null) {
+          keysBuilder_.dispose();
+          keysBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -17418,7 +17222,18 @@ public LWWMap parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new LWWMap(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -17484,7 +17299,7 @@ org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.PNCounterMap}
    */
-  public  static final class PNCounterMap extends
+  public static final class PNCounterMap extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.PNCounterMap)
       PNCounterMapOrBuilder {
@@ -17504,74 +17319,6 @@ protected java.lang.Object newInstance(
       return new PNCounterMap();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private PNCounterMap(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = keys_.toBuilder();
-              }
-              keys_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(keys_);
-                keys_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                entries_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              entries_.add(
-                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          entries_ = java.util.Collections.unmodifiableList(entries_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_PNCounterMap_descriptor;
@@ -17636,136 +17383,51 @@ public interface EntryOrBuilder extends
        * optional sint64 longKey = 4;
        * @return Whether the longKey field is set.
        */
-      boolean hasLongKey();
-      /**
-       * optional sint64 longKey = 4;
-       * @return The longKey.
-       */
-      long getLongKey();
-
-      /**
-       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
-       * @return Whether the otherKey field is set.
-       */
-      boolean hasOtherKey();
-      /**
-       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
-       * @return The otherKey.
-       */
-      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey();
-      /**
-       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
-       */
-      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder();
-    }
-    /**
-     * Protobuf type {@code org.apache.pekko.cluster.ddata.PNCounterMap.Entry}
-     */
-    public  static final class Entry extends
-        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.PNCounterMap.Entry)
-        EntryOrBuilder {
-    private static final long serialVersionUID = 0L;
-      // Use Entry.newBuilder() to construct.
-      private Entry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
-        super(builder);
-      }
-      private Entry() {
-        stringKey_ = "";
-      }
-
-      @java.lang.Override
-      @SuppressWarnings({"unused"})
-      protected java.lang.Object newInstance(
-          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
-        return new Entry();
-      }
-
-      @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private Entry(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10: {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000001;
-                stringKey_ = bs;
-                break;
-              }
-              case 18: {
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000002) != 0)) {
-                  subBuilder = value_.toBuilder();
-                }
-                value_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(value_);
-                  value_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000002;
-                break;
-              }
-              case 24: {
-                bitField0_ |= 0x00000004;
-                intKey_ = input.readSInt32();
-                break;
-              }
-              case 32: {
-                bitField0_ |= 0x00000008;
-                longKey_ = input.readSInt64();
-                break;
-              }
-              case 42: {
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000010) != 0)) {
-                  subBuilder = otherKey_.toBuilder();
-                }
-                otherKey_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(otherKey_);
-                  otherKey_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000010;
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
+      boolean hasLongKey();
+      /**
+       * optional sint64 longKey = 4;
+       * @return The longKey.
+       */
+      long getLongKey();
+
+      /**
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
+       * @return Whether the otherKey field is set.
+       */
+      boolean hasOtherKey();
+      /**
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
+       * @return The otherKey.
+       */
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey();
+      /**
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
+       */
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder();
+    }
+    /**
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.PNCounterMap.Entry}
+     */
+    public static final class Entry extends
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+        // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.PNCounterMap.Entry)
+        EntryOrBuilder {
+    private static final long serialVersionUID = 0L;
+      // Use Entry.newBuilder() to construct.
+      private Entry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+        super(builder);
       }
+      private Entry() {
+        stringKey_ = "";
+      }
+
+      @java.lang.Override
+      @SuppressWarnings({"unused"})
+      protected java.lang.Object newInstance(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        return new Entry();
+      }
+
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_PNCounterMap_Entry_descriptor;
@@ -17781,11 +17443,13 @@ private Entry(
 
       private int bitField0_;
       public static final int STRINGKEY_FIELD_NUMBER = 1;
-      private volatile java.lang.Object stringKey_;
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object stringKey_ = "";
       /**
        * optional string stringKey = 1;
        * @return Whether the stringKey field is set.
        */
+      @java.lang.Override
       public boolean hasStringKey() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -17793,6 +17457,7 @@ public boolean hasStringKey() {
        * optional string stringKey = 1;
        * @return The stringKey.
        */
+      @java.lang.Override
       public java.lang.String getStringKey() {
         java.lang.Object ref = stringKey_;
         if (ref instanceof java.lang.String) {
@@ -17811,6 +17476,7 @@ public java.lang.String getStringKey() {
        * optional string stringKey = 1;
        * @return The bytes for stringKey.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString
           getStringKeyBytes() {
         java.lang.Object ref = stringKey_;
@@ -17831,6 +17497,7 @@ public java.lang.String getStringKey() {
        * required .org.apache.pekko.cluster.ddata.PNCounter value = 2;
        * @return Whether the value field is set.
        */
+      @java.lang.Override
       public boolean hasValue() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -17838,22 +17505,25 @@ public boolean hasValue() {
        * required .org.apache.pekko.cluster.ddata.PNCounter value = 2;
        * @return The value.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter getValue() {
         return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.getDefaultInstance() : value_;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.PNCounter value = 2;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterOrBuilder getValueOrBuilder() {
         return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.getDefaultInstance() : value_;
       }
 
       public static final int INTKEY_FIELD_NUMBER = 3;
-      private int intKey_;
+      private int intKey_ = 0;
       /**
        * optional sint32 intKey = 3;
        * @return Whether the intKey field is set.
        */
+      @java.lang.Override
       public boolean hasIntKey() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -17861,16 +17531,18 @@ public boolean hasIntKey() {
        * optional sint32 intKey = 3;
        * @return The intKey.
        */
+      @java.lang.Override
       public int getIntKey() {
         return intKey_;
       }
 
       public static final int LONGKEY_FIELD_NUMBER = 4;
-      private long longKey_;
+      private long longKey_ = 0L;
       /**
        * optional sint64 longKey = 4;
        * @return Whether the longKey field is set.
        */
+      @java.lang.Override
       public boolean hasLongKey() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -17878,6 +17550,7 @@ public boolean hasLongKey() {
        * optional sint64 longKey = 4;
        * @return The longKey.
        */
+      @java.lang.Override
       public long getLongKey() {
         return longKey_;
       }
@@ -17888,6 +17561,7 @@ public long getLongKey() {
        * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return Whether the otherKey field is set.
        */
+      @java.lang.Override
       public boolean hasOtherKey() {
         return ((bitField0_ & 0x00000010) != 0);
       }
@@ -17895,12 +17569,14 @@ public boolean hasOtherKey() {
        * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return The otherKey.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
         return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
       }
       /**
        * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
         return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
       }
@@ -17948,7 +17624,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         if (((bitField0_ & 0x00000010) != 0)) {
           output.writeMessage(5, getOtherKey());
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -17976,7 +17652,7 @@ public int getSerializedSize() {
           size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(5, getOtherKey());
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -18016,7 +17692,7 @@ public boolean equals(final java.lang.Object obj) {
           if (!getOtherKey()
               .equals(other.getOtherKey())) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -18048,7 +17724,7 @@ public int hashCode() {
           hash = (37 * hash) + OTHERKEY_FIELD_NUMBER;
           hash = (53 * hash) + getOtherKey().hashCode();
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -18097,11 +17773,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseDelimitedFrom(
           java.io.InputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -18183,24 +17861,20 @@ private void maybeForceBuilderInitialization() {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           stringKey_ = "";
-          bitField0_ = (bitField0_ & ~0x00000001);
-          if (valueBuilder_ == null) {
-            value_ = null;
-          } else {
-            valueBuilder_.clear();
+          value_ = null;
+          if (valueBuilder_ != null) {
+            valueBuilder_.dispose();
+            valueBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000002);
           intKey_ = 0;
-          bitField0_ = (bitField0_ & ~0x00000004);
           longKey_ = 0L;
-          bitField0_ = (bitField0_ & ~0x00000008);
-          if (otherKeyBuilder_ == null) {
-            otherKey_ = null;
-          } else {
-            otherKeyBuilder_.clear();
+          otherKey_ = null;
+          if (otherKeyBuilder_ != null) {
+            otherKeyBuilder_.dispose();
+            otherKeyBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000010);
           return this;
         }
 
@@ -18227,18 +17901,22 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCoun
         @java.lang.Override
         public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry buildPartial() {
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.stringKey_ = stringKey_;
             to_bitField0_ |= 0x00000001;
           }
-          result.stringKey_ = stringKey_;
           if (((from_bitField0_ & 0x00000002) != 0)) {
-            if (valueBuilder_ == null) {
-              result.value_ = value_;
-            } else {
-              result.value_ = valueBuilder_.build();
-            }
+            result.value_ = valueBuilder_ == null
+                ? value_
+                : valueBuilder_.build();
             to_bitField0_ |= 0x00000002;
           }
           if (((from_bitField0_ & 0x00000004) != 0)) {
@@ -18250,16 +17928,12 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCoun
             to_bitField0_ |= 0x00000008;
           }
           if (((from_bitField0_ & 0x00000010) != 0)) {
-            if (otherKeyBuilder_ == null) {
-              result.otherKey_ = otherKey_;
-            } else {
-              result.otherKey_ = otherKeyBuilder_.build();
-            }
+            result.otherKey_ = otherKeyBuilder_ == null
+                ? otherKey_
+                : otherKeyBuilder_.build();
             to_bitField0_ |= 0x00000010;
           }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -18307,8 +17981,8 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
         public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry other) {
           if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.getDefaultInstance()) return this;
           if (other.hasStringKey()) {
-            bitField0_ |= 0x00000001;
             stringKey_ = other.stringKey_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (other.hasValue()) {
@@ -18323,7 +17997,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
           if (other.hasOtherKey()) {
             mergeOtherKey(other.getOtherKey());
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -18349,17 +18023,59 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 10: {
+                  stringKey_ = input.readBytes();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+                case 18: {
+                  input.readMessage(
+                      getValueFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                case 24: {
+                  intKey_ = input.readSInt32();
+                  bitField0_ |= 0x00000004;
+                  break;
+                } // case 24
+                case 32: {
+                  longKey_ = input.readSInt64();
+                  bitField0_ |= 0x00000008;
+                  break;
+                } // case 32
+                case 42: {
+                  input.readMessage(
+                      getOtherKeyFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000010;
+                  break;
+                } // case 42
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
         private int bitField0_;
@@ -18414,11 +18130,9 @@ public java.lang.String getStringKey() {
          */
         public Builder setStringKey(
             java.lang.String value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+          if (value == null) { throw new NullPointerException(); }
           stringKey_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -18427,8 +18141,8 @@ public Builder setStringKey(
          * @return This builder for chaining.
          */
         public Builder clearStringKey() {
-          bitField0_ = (bitField0_ & ~0x00000001);
           stringKey_ = getDefaultInstance().getStringKey();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -18439,11 +18153,9 @@ public Builder clearStringKey() {
          */
         public Builder setStringKeyBytes(
             org.apache.pekko.protobufv3.internal.ByteString value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+          if (value == null) { throw new NullPointerException(); }
           stringKey_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -18478,11 +18190,11 @@ public Builder setValue(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDa
               throw new NullPointerException();
             }
             value_ = value;
-            onChanged();
           } else {
             valueBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /**
@@ -18492,11 +18204,11 @@ public Builder setValue(
             org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.Builder builderForValue) {
           if (valueBuilder_ == null) {
             value_ = builderForValue.build();
-            onChanged();
           } else {
             valueBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /**
@@ -18505,31 +18217,32 @@ public Builder setValue(
         public Builder mergeValue(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter value) {
           if (valueBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
-                value_ != null &&
-                value_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.getDefaultInstance()) {
-              value_ =
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.newBuilder(value_).mergeFrom(value).buildPartial();
+              value_ != null &&
+              value_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.getDefaultInstance()) {
+              getValueBuilder().mergeFrom(value);
             } else {
               value_ = value;
             }
-            onChanged();
           } else {
             valueBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000002;
+          if (value_ != null) {
+            bitField0_ |= 0x00000002;
+            onChanged();
+          }
           return this;
         }
         /**
          * required .org.apache.pekko.cluster.ddata.PNCounter value = 2;
          */
         public Builder clearValue() {
-          if (valueBuilder_ == null) {
-            value_ = null;
-            onChanged();
-          } else {
-            valueBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000002);
+          value_ = null;
+          if (valueBuilder_ != null) {
+            valueBuilder_.dispose();
+            valueBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -18573,6 +18286,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCoun
          * optional sint32 intKey = 3;
          * @return Whether the intKey field is set.
          */
+        @java.lang.Override
         public boolean hasIntKey() {
           return ((bitField0_ & 0x00000004) != 0);
         }
@@ -18580,6 +18294,7 @@ public boolean hasIntKey() {
          * optional sint32 intKey = 3;
          * @return The intKey.
          */
+        @java.lang.Override
         public int getIntKey() {
           return intKey_;
         }
@@ -18589,8 +18304,9 @@ public int getIntKey() {
          * @return This builder for chaining.
          */
         public Builder setIntKey(int value) {
-          bitField0_ |= 0x00000004;
+
           intKey_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -18610,6 +18326,7 @@ public Builder clearIntKey() {
          * optional sint64 longKey = 4;
          * @return Whether the longKey field is set.
          */
+        @java.lang.Override
         public boolean hasLongKey() {
           return ((bitField0_ & 0x00000008) != 0);
         }
@@ -18617,6 +18334,7 @@ public boolean hasLongKey() {
          * optional sint64 longKey = 4;
          * @return The longKey.
          */
+        @java.lang.Override
         public long getLongKey() {
           return longKey_;
         }
@@ -18626,8 +18344,9 @@ public long getLongKey() {
          * @return This builder for chaining.
          */
         public Builder setLongKey(long value) {
-          bitField0_ |= 0x00000008;
+
           longKey_ = value;
+          bitField0_ |= 0x00000008;
           onChanged();
           return this;
         }
@@ -18672,11 +18391,11 @@ public Builder setOtherKey(org.apache.pekko.cluster.ddata.protobuf.msg.Replicato
               throw new NullPointerException();
             }
             otherKey_ = value;
-            onChanged();
           } else {
             otherKeyBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000010;
+          onChanged();
           return this;
         }
         /**
@@ -18686,11 +18405,11 @@ public Builder setOtherKey(
             org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
           if (otherKeyBuilder_ == null) {
             otherKey_ = builderForValue.build();
-            onChanged();
           } else {
             otherKeyBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000010;
+          onChanged();
           return this;
         }
         /**
@@ -18699,31 +18418,32 @@ public Builder setOtherKey(
         public Builder mergeOtherKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (otherKeyBuilder_ == null) {
             if (((bitField0_ & 0x00000010) != 0) &&
-                otherKey_ != null &&
-                otherKey_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-              otherKey_ =
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(otherKey_).mergeFrom(value).buildPartial();
+              otherKey_ != null &&
+              otherKey_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              getOtherKeyBuilder().mergeFrom(value);
             } else {
               otherKey_ = value;
             }
-            onChanged();
           } else {
             otherKeyBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000010;
+          if (otherKey_ != null) {
+            bitField0_ |= 0x00000010;
+            onChanged();
+          }
           return this;
         }
         /**
          * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
         public Builder clearOtherKey() {
-          if (otherKeyBuilder_ == null) {
-            otherKey_ = null;
-            onChanged();
-          } else {
-            otherKeyBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000010);
+          otherKey_ = null;
+          if (otherKeyBuilder_ != null) {
+            otherKeyBuilder_.dispose();
+            otherKeyBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -18794,7 +18514,18 @@ public Entry parsePartialFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-          return new Entry(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
@@ -18821,6 +18552,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCoun
      * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return Whether the keys field is set.
      */
+    @java.lang.Override
     public boolean hasKeys() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -18828,27 +18560,32 @@ public boolean hasKeys() {
      * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return The keys.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys() {
       return keys_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder() {
       return keys_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 2;
+    @SuppressWarnings("serial")
     private java.util.List entries_;
     /**
      * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
      */
+    @java.lang.Override
     public java.util.List getEntriesList() {
       return entries_;
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
      */
+    @java.lang.Override
     public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
@@ -18856,18 +18593,21 @@ public java.util.Listrepeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
      */
+    @java.lang.Override
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
@@ -18907,7 +18647,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < entries_.size(); i++) {
         output.writeMessage(2, entries_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -18924,7 +18664,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, entries_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -18946,7 +18686,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getEntriesList()
           .equals(other.getEntriesList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -18965,7 +18705,7 @@ public int hashCode() {
         hash = (37 * hash) + ENTRIES_FIELD_NUMBER;
         hash = (53 * hash) + getEntriesList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -19014,11 +18754,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -19100,18 +18842,19 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (keysBuilder_ == null) {
-          keys_ = null;
-        } else {
-          keysBuilder_.clear();
+        bitField0_ = 0;
+        keys_ = null;
+        if (keysBuilder_ != null) {
+          keysBuilder_.dispose();
+          keysBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         if (entriesBuilder_ == null) {
           entries_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
+          entries_ = null;
           entriesBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -19138,16 +18881,13 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCoun
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (keysBuilder_ == null) {
-            result.keys_ = keys_;
-          } else {
-            result.keys_ = keysBuilder_.build();
-          }
-          to_bitField0_ |= 0x00000001;
-        }
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap result) {
         if (entriesBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
             entries_ = java.util.Collections.unmodifiableList(entries_);
@@ -19157,9 +18897,18 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCoun
         } else {
           result.entries_ = entriesBuilder_.build();
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.keys_ = keysBuilder_ == null
+              ? keys_
+              : keysBuilder_.build();
+          to_bitField0_ |= 0x00000001;
+        }
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -19235,7 +18984,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -19261,17 +19010,50 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getKeysFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.PARSER,
+                        extensionRegistry);
+                if (entriesBuilder_ == null) {
+                  ensureEntriesIsMutable();
+                  entries_.add(m);
+                } else {
+                  entriesBuilder_.addMessage(m);
+                }
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -19306,11 +19088,11 @@ public Builder setKeys(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDat
             throw new NullPointerException();
           }
           keys_ = value;
-          onChanged();
         } else {
           keysBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -19320,11 +19102,11 @@ public Builder setKeys(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
         if (keysBuilder_ == null) {
           keys_ = builderForValue.build();
-          onChanged();
         } else {
           keysBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -19333,31 +19115,32 @@ public Builder setKeys(
       public Builder mergeKeys(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
         if (keysBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              keys_ != null &&
-              keys_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
-            keys_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(keys_).mergeFrom(value).buildPartial();
+            keys_ != null &&
+            keys_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
+            getKeysBuilder().mergeFrom(value);
           } else {
             keys_ = value;
           }
-          onChanged();
         } else {
           keysBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (keys_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
       public Builder clearKeys() {
-        if (keysBuilder_ == null) {
-          keys_ = null;
-          onChanged();
-        } else {
-          keysBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        keys_ = null;
+        if (keysBuilder_ != null) {
+          keysBuilder_.dispose();
+          keysBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -19668,7 +19451,18 @@ public PNCounterMap parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new PNCounterMap(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -19745,99 +19539,26 @@ org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.En
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMultiMap}
    */
-  public  static final class ORMultiMap extends
+  public static final class ORMultiMap extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ORMultiMap)
       ORMultiMapOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ORMultiMap.newBuilder() to construct.
-    private ORMultiMap(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private ORMultiMap() {
-      entries_ = java.util.Collections.emptyList();
-    }
-
-    @java.lang.Override
-    @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(
-        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
-      return new ORMultiMap();
-    }
-
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ORMultiMap(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = keys_.toBuilder();
-              }
-              keys_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(keys_);
-                keys_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                entries_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              entries_.add(
-                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.PARSER, extensionRegistry));
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000002;
-              withValueDeltas_ = input.readBool();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          entries_ = java.util.Collections.unmodifiableList(entries_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
+    private ORMultiMap(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      super(builder);
+    }
+    private ORMultiMap() {
+      entries_ = java.util.Collections.emptyList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+      return new ORMultiMap();
     }
+
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_ORMultiMap_descriptor;
@@ -19927,7 +19648,7 @@ public interface EntryOrBuilder extends
     /**
      * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMultiMap.Entry}
      */
-    public  static final class Entry extends
+    public static final class Entry extends
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ORMultiMap.Entry)
         EntryOrBuilder {
@@ -19947,91 +19668,6 @@ protected java.lang.Object newInstance(
         return new Entry();
       }
 
-      @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private Entry(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10: {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000001;
-                stringKey_ = bs;
-                break;
-              }
-              case 18: {
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000002) != 0)) {
-                  subBuilder = value_.toBuilder();
-                }
-                value_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(value_);
-                  value_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000002;
-                break;
-              }
-              case 24: {
-                bitField0_ |= 0x00000004;
-                intKey_ = input.readSInt32();
-                break;
-              }
-              case 32: {
-                bitField0_ |= 0x00000008;
-                longKey_ = input.readSInt64();
-                break;
-              }
-              case 42: {
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000010) != 0)) {
-                  subBuilder = otherKey_.toBuilder();
-                }
-                otherKey_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(otherKey_);
-                  otherKey_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000010;
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_org_apache_pekko_cluster_ddata_ORMultiMap_Entry_descriptor;
@@ -20047,11 +19683,13 @@ private Entry(
 
       private int bitField0_;
       public static final int STRINGKEY_FIELD_NUMBER = 1;
-      private volatile java.lang.Object stringKey_;
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object stringKey_ = "";
       /**
        * optional string stringKey = 1;
        * @return Whether the stringKey field is set.
        */
+      @java.lang.Override
       public boolean hasStringKey() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -20059,6 +19697,7 @@ public boolean hasStringKey() {
        * optional string stringKey = 1;
        * @return The stringKey.
        */
+      @java.lang.Override
       public java.lang.String getStringKey() {
         java.lang.Object ref = stringKey_;
         if (ref instanceof java.lang.String) {
@@ -20077,6 +19716,7 @@ public java.lang.String getStringKey() {
        * optional string stringKey = 1;
        * @return The bytes for stringKey.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString
           getStringKeyBytes() {
         java.lang.Object ref = stringKey_;
@@ -20097,6 +19737,7 @@ public java.lang.String getStringKey() {
        * required .org.apache.pekko.cluster.ddata.ORSet value = 2;
        * @return Whether the value field is set.
        */
+      @java.lang.Override
       public boolean hasValue() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -20104,22 +19745,25 @@ public boolean hasValue() {
        * required .org.apache.pekko.cluster.ddata.ORSet value = 2;
        * @return The value.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getValue() {
         return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : value_;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.ORSet value = 2;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getValueOrBuilder() {
         return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : value_;
       }
 
       public static final int INTKEY_FIELD_NUMBER = 3;
-      private int intKey_;
+      private int intKey_ = 0;
       /**
        * optional sint32 intKey = 3;
        * @return Whether the intKey field is set.
        */
+      @java.lang.Override
       public boolean hasIntKey() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -20127,16 +19771,18 @@ public boolean hasIntKey() {
        * optional sint32 intKey = 3;
        * @return The intKey.
        */
+      @java.lang.Override
       public int getIntKey() {
         return intKey_;
       }
 
       public static final int LONGKEY_FIELD_NUMBER = 4;
-      private long longKey_;
+      private long longKey_ = 0L;
       /**
        * optional sint64 longKey = 4;
        * @return Whether the longKey field is set.
        */
+      @java.lang.Override
       public boolean hasLongKey() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -20144,6 +19790,7 @@ public boolean hasLongKey() {
        * optional sint64 longKey = 4;
        * @return The longKey.
        */
+      @java.lang.Override
       public long getLongKey() {
         return longKey_;
       }
@@ -20154,6 +19801,7 @@ public long getLongKey() {
        * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return Whether the otherKey field is set.
        */
+      @java.lang.Override
       public boolean hasOtherKey() {
         return ((bitField0_ & 0x00000010) != 0);
       }
@@ -20161,12 +19809,14 @@ public boolean hasOtherKey() {
        * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return The otherKey.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
         return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
       }
       /**
        * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
         return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
       }
@@ -20214,7 +19864,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         if (((bitField0_ & 0x00000010) != 0)) {
           output.writeMessage(5, getOtherKey());
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -20242,7 +19892,7 @@ public int getSerializedSize() {
           size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(5, getOtherKey());
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -20282,7 +19932,7 @@ public boolean equals(final java.lang.Object obj) {
           if (!getOtherKey()
               .equals(other.getOtherKey())) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -20314,7 +19964,7 @@ public int hashCode() {
           hash = (37 * hash) + OTHERKEY_FIELD_NUMBER;
           hash = (53 * hash) + getOtherKey().hashCode();
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -20363,11 +20013,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseDelimitedFrom(
           java.io.InputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -20449,24 +20101,20 @@ private void maybeForceBuilderInitialization() {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           stringKey_ = "";
-          bitField0_ = (bitField0_ & ~0x00000001);
-          if (valueBuilder_ == null) {
-            value_ = null;
-          } else {
-            valueBuilder_.clear();
+          value_ = null;
+          if (valueBuilder_ != null) {
+            valueBuilder_.dispose();
+            valueBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000002);
           intKey_ = 0;
-          bitField0_ = (bitField0_ & ~0x00000004);
           longKey_ = 0L;
-          bitField0_ = (bitField0_ & ~0x00000008);
-          if (otherKeyBuilder_ == null) {
-            otherKey_ = null;
-          } else {
-            otherKeyBuilder_.clear();
+          otherKey_ = null;
+          if (otherKeyBuilder_ != null) {
+            otherKeyBuilder_.dispose();
+            otherKeyBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000010);
           return this;
         }
 
@@ -20493,18 +20141,22 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMult
         @java.lang.Override
         public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry buildPartial() {
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.stringKey_ = stringKey_;
             to_bitField0_ |= 0x00000001;
           }
-          result.stringKey_ = stringKey_;
           if (((from_bitField0_ & 0x00000002) != 0)) {
-            if (valueBuilder_ == null) {
-              result.value_ = value_;
-            } else {
-              result.value_ = valueBuilder_.build();
-            }
+            result.value_ = valueBuilder_ == null
+                ? value_
+                : valueBuilder_.build();
             to_bitField0_ |= 0x00000002;
           }
           if (((from_bitField0_ & 0x00000004) != 0)) {
@@ -20516,16 +20168,12 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMult
             to_bitField0_ |= 0x00000008;
           }
           if (((from_bitField0_ & 0x00000010) != 0)) {
-            if (otherKeyBuilder_ == null) {
-              result.otherKey_ = otherKey_;
-            } else {
-              result.otherKey_ = otherKeyBuilder_.build();
-            }
+            result.otherKey_ = otherKeyBuilder_ == null
+                ? otherKey_
+                : otherKeyBuilder_.build();
             to_bitField0_ |= 0x00000010;
           }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -20573,8 +20221,8 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
         public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry other) {
           if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.getDefaultInstance()) return this;
           if (other.hasStringKey()) {
-            bitField0_ |= 0x00000001;
             stringKey_ = other.stringKey_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (other.hasValue()) {
@@ -20589,7 +20237,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
           if (other.hasOtherKey()) {
             mergeOtherKey(other.getOtherKey());
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -20615,17 +20263,59 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 10: {
+                  stringKey_ = input.readBytes();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+                case 18: {
+                  input.readMessage(
+                      getValueFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                case 24: {
+                  intKey_ = input.readSInt32();
+                  bitField0_ |= 0x00000004;
+                  break;
+                } // case 24
+                case 32: {
+                  longKey_ = input.readSInt64();
+                  bitField0_ |= 0x00000008;
+                  break;
+                } // case 32
+                case 42: {
+                  input.readMessage(
+                      getOtherKeyFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000010;
+                  break;
+                } // case 42
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
         private int bitField0_;
@@ -20680,11 +20370,9 @@ public java.lang.String getStringKey() {
          */
         public Builder setStringKey(
             java.lang.String value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+          if (value == null) { throw new NullPointerException(); }
           stringKey_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -20693,8 +20381,8 @@ public Builder setStringKey(
          * @return This builder for chaining.
          */
         public Builder clearStringKey() {
-          bitField0_ = (bitField0_ & ~0x00000001);
           stringKey_ = getDefaultInstance().getStringKey();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -20705,11 +20393,9 @@ public Builder clearStringKey() {
          */
         public Builder setStringKeyBytes(
             org.apache.pekko.protobufv3.internal.ByteString value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+          if (value == null) { throw new NullPointerException(); }
           stringKey_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -20744,11 +20430,11 @@ public Builder setValue(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDa
               throw new NullPointerException();
             }
             value_ = value;
-            onChanged();
           } else {
             valueBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /**
@@ -20758,11 +20444,11 @@ public Builder setValue(
             org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
           if (valueBuilder_ == null) {
             value_ = builderForValue.build();
-            onChanged();
           } else {
             valueBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /**
@@ -20771,31 +20457,32 @@ public Builder setValue(
         public Builder mergeValue(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
           if (valueBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
-                value_ != null &&
-                value_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
-              value_ =
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(value_).mergeFrom(value).buildPartial();
+              value_ != null &&
+              value_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
+              getValueBuilder().mergeFrom(value);
             } else {
               value_ = value;
             }
-            onChanged();
           } else {
             valueBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000002;
+          if (value_ != null) {
+            bitField0_ |= 0x00000002;
+            onChanged();
+          }
           return this;
         }
         /**
          * required .org.apache.pekko.cluster.ddata.ORSet value = 2;
          */
         public Builder clearValue() {
-          if (valueBuilder_ == null) {
-            value_ = null;
-            onChanged();
-          } else {
-            valueBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000002);
+          value_ = null;
+          if (valueBuilder_ != null) {
+            valueBuilder_.dispose();
+            valueBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -20839,6 +20526,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetO
          * optional sint32 intKey = 3;
          * @return Whether the intKey field is set.
          */
+        @java.lang.Override
         public boolean hasIntKey() {
           return ((bitField0_ & 0x00000004) != 0);
         }
@@ -20846,6 +20534,7 @@ public boolean hasIntKey() {
          * optional sint32 intKey = 3;
          * @return The intKey.
          */
+        @java.lang.Override
         public int getIntKey() {
           return intKey_;
         }
@@ -20855,8 +20544,9 @@ public int getIntKey() {
          * @return This builder for chaining.
          */
         public Builder setIntKey(int value) {
-          bitField0_ |= 0x00000004;
+
           intKey_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -20876,6 +20566,7 @@ public Builder clearIntKey() {
          * optional sint64 longKey = 4;
          * @return Whether the longKey field is set.
          */
+        @java.lang.Override
         public boolean hasLongKey() {
           return ((bitField0_ & 0x00000008) != 0);
         }
@@ -20883,6 +20574,7 @@ public boolean hasLongKey() {
          * optional sint64 longKey = 4;
          * @return The longKey.
          */
+        @java.lang.Override
         public long getLongKey() {
           return longKey_;
         }
@@ -20892,8 +20584,9 @@ public long getLongKey() {
          * @return This builder for chaining.
          */
         public Builder setLongKey(long value) {
-          bitField0_ |= 0x00000008;
+
           longKey_ = value;
+          bitField0_ |= 0x00000008;
           onChanged();
           return this;
         }
@@ -20938,11 +20631,11 @@ public Builder setOtherKey(org.apache.pekko.cluster.ddata.protobuf.msg.Replicato
               throw new NullPointerException();
             }
             otherKey_ = value;
-            onChanged();
           } else {
             otherKeyBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000010;
+          onChanged();
           return this;
         }
         /**
@@ -20952,11 +20645,11 @@ public Builder setOtherKey(
             org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
           if (otherKeyBuilder_ == null) {
             otherKey_ = builderForValue.build();
-            onChanged();
           } else {
             otherKeyBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000010;
+          onChanged();
           return this;
         }
         /**
@@ -20965,31 +20658,32 @@ public Builder setOtherKey(
         public Builder mergeOtherKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (otherKeyBuilder_ == null) {
             if (((bitField0_ & 0x00000010) != 0) &&
-                otherKey_ != null &&
-                otherKey_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-              otherKey_ =
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(otherKey_).mergeFrom(value).buildPartial();
+              otherKey_ != null &&
+              otherKey_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              getOtherKeyBuilder().mergeFrom(value);
             } else {
               otherKey_ = value;
             }
-            onChanged();
           } else {
             otherKeyBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000010;
+          if (otherKey_ != null) {
+            bitField0_ |= 0x00000010;
+            onChanged();
+          }
           return this;
         }
         /**
          * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
         public Builder clearOtherKey() {
-          if (otherKeyBuilder_ == null) {
-            otherKey_ = null;
-            onChanged();
-          } else {
-            otherKeyBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000010);
+          otherKey_ = null;
+          if (otherKeyBuilder_ != null) {
+            otherKeyBuilder_.dispose();
+            otherKeyBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -21060,7 +20754,18 @@ public Entry parsePartialFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-          return new Entry(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
@@ -21087,6 +20792,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMult
      * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return Whether the keys field is set.
      */
+    @java.lang.Override
     public boolean hasKeys() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -21094,27 +20800,32 @@ public boolean hasKeys() {
      * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return The keys.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys() {
       return keys_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder() {
       return keys_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 2;
+    @SuppressWarnings("serial")
     private java.util.List entries_;
     /**
      * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
      */
+    @java.lang.Override
     public java.util.List getEntriesList() {
       return entries_;
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
      */
+    @java.lang.Override
     public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
@@ -21122,29 +20833,33 @@ public java.util.Listrepeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
      */
+    @java.lang.Override
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
     }
 
     public static final int WITHVALUEDELTAS_FIELD_NUMBER = 3;
-    private boolean withValueDeltas_;
+    private boolean withValueDeltas_ = false;
     /**
      * optional bool withValueDeltas = 3;
      * @return Whether the withValueDeltas field is set.
      */
+    @java.lang.Override
     public boolean hasWithValueDeltas() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -21152,6 +20867,7 @@ public boolean hasWithValueDeltas() {
      * optional bool withValueDeltas = 3;
      * @return The withValueDeltas.
      */
+    @java.lang.Override
     public boolean getWithValueDeltas() {
       return withValueDeltas_;
     }
@@ -21193,7 +20909,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeBool(3, withValueDeltas_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -21214,7 +20930,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(3, withValueDeltas_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -21241,7 +20957,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getWithValueDeltas()
             != other.getWithValueDeltas()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -21265,7 +20981,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getWithValueDeltas());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -21314,11 +21030,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -21400,20 +21118,20 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (keysBuilder_ == null) {
-          keys_ = null;
-        } else {
-          keysBuilder_.clear();
+        bitField0_ = 0;
+        keys_ = null;
+        if (keysBuilder_ != null) {
+          keysBuilder_.dispose();
+          keysBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         if (entriesBuilder_ == null) {
           entries_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
+          entries_ = null;
           entriesBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000002);
         withValueDeltas_ = false;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -21440,16 +21158,13 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMult
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (keysBuilder_ == null) {
-            result.keys_ = keys_;
-          } else {
-            result.keys_ = keysBuilder_.build();
-          }
-          to_bitField0_ |= 0x00000001;
-        }
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap result) {
         if (entriesBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
             entries_ = java.util.Collections.unmodifiableList(entries_);
@@ -21459,13 +21174,22 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMult
         } else {
           result.entries_ = entriesBuilder_.build();
         }
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.keys_ = keysBuilder_ == null
+              ? keys_
+              : keysBuilder_.build();
+          to_bitField0_ |= 0x00000001;
+        }
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.withValueDeltas_ = withValueDeltas_;
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -21544,7 +21268,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedD
         if (other.hasWithValueDeltas()) {
           setWithValueDeltas(other.getWithValueDeltas());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -21570,17 +21294,55 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getKeysFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.PARSER,
+                        extensionRegistry);
+                if (entriesBuilder_ == null) {
+                  ensureEntriesIsMutable();
+                  entries_.add(m);
+                } else {
+                  entriesBuilder_.addMessage(m);
+                }
+                break;
+              } // case 18
+              case 24: {
+                withValueDeltas_ = input.readBool();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -21615,11 +21377,11 @@ public Builder setKeys(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDat
             throw new NullPointerException();
           }
           keys_ = value;
-          onChanged();
         } else {
           keysBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -21629,11 +21391,11 @@ public Builder setKeys(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
         if (keysBuilder_ == null) {
           keys_ = builderForValue.build();
-          onChanged();
         } else {
           keysBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -21642,31 +21404,32 @@ public Builder setKeys(
       public Builder mergeKeys(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
         if (keysBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              keys_ != null &&
-              keys_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
-            keys_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(keys_).mergeFrom(value).buildPartial();
+            keys_ != null &&
+            keys_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
+            getKeysBuilder().mergeFrom(value);
           } else {
             keys_ = value;
           }
-          onChanged();
         } else {
           keysBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (keys_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
       public Builder clearKeys() {
-        if (keysBuilder_ == null) {
-          keys_ = null;
-          onChanged();
-        } else {
-          keysBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        keys_ = null;
+        if (keysBuilder_ != null) {
+          keysBuilder_.dispose();
+          keysBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -21950,6 +21713,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMult
        * optional bool withValueDeltas = 3;
        * @return Whether the withValueDeltas field is set.
        */
+      @java.lang.Override
       public boolean hasWithValueDeltas() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -21957,6 +21721,7 @@ public boolean hasWithValueDeltas() {
        * optional bool withValueDeltas = 3;
        * @return The withValueDeltas.
        */
+      @java.lang.Override
       public boolean getWithValueDeltas() {
         return withValueDeltas_;
       }
@@ -21966,8 +21731,9 @@ public boolean getWithValueDeltas() {
        * @return This builder for chaining.
        */
       public Builder setWithValueDeltas(boolean value) {
-        bitField0_ |= 0x00000004;
+
         withValueDeltas_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -22014,7 +21780,18 @@ public ORMultiMap parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ORMultiMap(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
diff --git a/distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatorMessages.java b/distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatorMessages.java
index 364f1f378c5..8962baa65b6 100644
--- a/distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatorMessages.java
+++ b/distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatorMessages.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2020-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ReplicatorMessages.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.cluster.ddata.protobuf.msg;
 
 public final class ReplicatorMessages {
@@ -108,7 +109,7 @@ public interface GetOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.Get}
    */
-  public  static final class Get extends
+  public static final class Get extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Get)
       GetOrBuilder {
@@ -127,95 +128,6 @@ protected java.lang.Object newInstance(
       return new Get();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Get(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = key_.toBuilder();
-              }
-              key_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(key_);
-                key_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              consistency_ = input.readSInt32();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              timeout_ = input.readUInt32();
-              break;
-            }
-            case 34: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000008) != 0)) {
-                subBuilder = request_.toBuilder();
-              }
-              request_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(request_);
-                request_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000008;
-              break;
-            }
-            case 40: {
-              bitField0_ |= 0x00000010;
-              consistencyMinCap_ = input.readInt32();
-              break;
-            }
-            case 48: {
-              bitField0_ |= 0x00000020;
-              consistencyAdditional_ = input.readInt32();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_Get_descriptor;
@@ -236,6 +148,7 @@ private Get(
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
+    @java.lang.Override
     public boolean hasKey() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -243,22 +156,25 @@ public boolean hasKey() {
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
       return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
       return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
 
     public static final int CONSISTENCY_FIELD_NUMBER = 2;
-    private int consistency_;
+    private int consistency_ = 0;
     /**
      * required sint32 consistency = 2;
      * @return Whether the consistency field is set.
      */
+    @java.lang.Override
     public boolean hasConsistency() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -266,16 +182,18 @@ public boolean hasConsistency() {
      * required sint32 consistency = 2;
      * @return The consistency.
      */
+    @java.lang.Override
     public int getConsistency() {
       return consistency_;
     }
 
     public static final int TIMEOUT_FIELD_NUMBER = 3;
-    private int timeout_;
+    private int timeout_ = 0;
     /**
      * required uint32 timeout = 3;
      * @return Whether the timeout field is set.
      */
+    @java.lang.Override
     public boolean hasTimeout() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -283,6 +201,7 @@ public boolean hasTimeout() {
      * required uint32 timeout = 3;
      * @return The timeout.
      */
+    @java.lang.Override
     public int getTimeout() {
       return timeout_;
     }
@@ -293,6 +212,7 @@ public int getTimeout() {
      * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
      * @return Whether the request field is set.
      */
+    @java.lang.Override
     public boolean hasRequest() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -300,22 +220,25 @@ public boolean hasRequest() {
      * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
      * @return The request.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest() {
       return request_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
     }
     /**
      * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder() {
       return request_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
     }
 
     public static final int CONSISTENCYMINCAP_FIELD_NUMBER = 5;
-    private int consistencyMinCap_;
+    private int consistencyMinCap_ = 0;
     /**
      * optional int32 consistencyMinCap = 5;
      * @return Whether the consistencyMinCap field is set.
      */
+    @java.lang.Override
     public boolean hasConsistencyMinCap() {
       return ((bitField0_ & 0x00000010) != 0);
     }
@@ -323,16 +246,18 @@ public boolean hasConsistencyMinCap() {
      * optional int32 consistencyMinCap = 5;
      * @return The consistencyMinCap.
      */
+    @java.lang.Override
     public int getConsistencyMinCap() {
       return consistencyMinCap_;
     }
 
     public static final int CONSISTENCYADDITIONAL_FIELD_NUMBER = 6;
-    private int consistencyAdditional_;
+    private int consistencyAdditional_ = 0;
     /**
      * optional int32 consistencyAdditional = 6;
      * @return Whether the consistencyAdditional field is set.
      */
+    @java.lang.Override
     public boolean hasConsistencyAdditional() {
       return ((bitField0_ & 0x00000020) != 0);
     }
@@ -340,6 +265,7 @@ public boolean hasConsistencyAdditional() {
      * optional int32 consistencyAdditional = 6;
      * @return The consistencyAdditional.
      */
+    @java.lang.Override
     public int getConsistencyAdditional() {
       return consistencyAdditional_;
     }
@@ -398,7 +324,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000020) != 0)) {
         output.writeInt32(6, consistencyAdditional_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -431,7 +357,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(6, consistencyAdditional_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -476,7 +402,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getConsistencyAdditional()
             != other.getConsistencyAdditional()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -511,7 +437,7 @@ public int hashCode() {
         hash = (37 * hash) + CONSISTENCYADDITIONAL_FIELD_NUMBER;
         hash = (53 * hash) + getConsistencyAdditional();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -560,11 +486,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -646,26 +574,21 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (keyBuilder_ == null) {
-          key_ = null;
-        } else {
-          keyBuilder_.clear();
+        bitField0_ = 0;
+        key_ = null;
+        if (keyBuilder_ != null) {
+          keyBuilder_.dispose();
+          keyBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         consistency_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         timeout_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000004);
-        if (requestBuilder_ == null) {
-          request_ = null;
-        } else {
-          requestBuilder_.clear();
+        request_ = null;
+        if (requestBuilder_ != null) {
+          requestBuilder_.dispose();
+          requestBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000008);
         consistencyMinCap_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000010);
         consistencyAdditional_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000020);
         return this;
       }
 
@@ -692,14 +615,18 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get build(
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (keyBuilder_ == null) {
-            result.key_ = key_;
-          } else {
-            result.key_ = keyBuilder_.build();
-          }
+          result.key_ = keyBuilder_ == null
+              ? key_
+              : keyBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
@@ -711,11 +638,9 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get buildP
           to_bitField0_ |= 0x00000004;
         }
         if (((from_bitField0_ & 0x00000008) != 0)) {
-          if (requestBuilder_ == null) {
-            result.request_ = request_;
-          } else {
-            result.request_ = requestBuilder_.build();
-          }
+          result.request_ = requestBuilder_ == null
+              ? request_
+              : requestBuilder_.build();
           to_bitField0_ |= 0x00000008;
         }
         if (((from_bitField0_ & 0x00000010) != 0)) {
@@ -726,9 +651,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get buildP
           result.consistencyAdditional_ = consistencyAdditional_;
           to_bitField0_ |= 0x00000020;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -793,7 +716,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
         if (other.hasConsistencyAdditional()) {
           setConsistencyAdditional(other.getConsistencyAdditional());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -825,17 +748,64 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getKeyFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                consistency_ = input.readSInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                timeout_ = input.readUInt32();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 34: {
+                input.readMessage(
+                    getRequestFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 34
+              case 40: {
+                consistencyMinCap_ = input.readInt32();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 40
+              case 48: {
+                consistencyAdditional_ = input.readInt32();
+                bitField0_ |= 0x00000020;
+                break;
+              } // case 48
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -870,11 +840,11 @@ public Builder setKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMess
             throw new NullPointerException();
           }
           key_ = value;
-          onChanged();
         } else {
           keyBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -884,11 +854,11 @@ public Builder setKey(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (keyBuilder_ == null) {
           key_ = builderForValue.build();
-          onChanged();
         } else {
           keyBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -897,31 +867,32 @@ public Builder setKey(
       public Builder mergeKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              key_ != null &&
-              key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-            key_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
+            key_ != null &&
+            key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+            getKeyBuilder().mergeFrom(value);
           } else {
             key_ = value;
           }
-          onChanged();
         } else {
           keyBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (key_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder clearKey() {
-        if (keyBuilder_ == null) {
-          key_ = null;
-          onChanged();
-        } else {
-          keyBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        key_ = null;
+        if (keyBuilder_ != null) {
+          keyBuilder_.dispose();
+          keyBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -965,6 +936,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessa
        * required sint32 consistency = 2;
        * @return Whether the consistency field is set.
        */
+      @java.lang.Override
       public boolean hasConsistency() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -972,6 +944,7 @@ public boolean hasConsistency() {
        * required sint32 consistency = 2;
        * @return The consistency.
        */
+      @java.lang.Override
       public int getConsistency() {
         return consistency_;
       }
@@ -981,8 +954,9 @@ public int getConsistency() {
        * @return This builder for chaining.
        */
       public Builder setConsistency(int value) {
-        bitField0_ |= 0x00000002;
+
         consistency_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1002,6 +976,7 @@ public Builder clearConsistency() {
        * required uint32 timeout = 3;
        * @return Whether the timeout field is set.
        */
+      @java.lang.Override
       public boolean hasTimeout() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -1009,6 +984,7 @@ public boolean hasTimeout() {
        * required uint32 timeout = 3;
        * @return The timeout.
        */
+      @java.lang.Override
       public int getTimeout() {
         return timeout_;
       }
@@ -1018,8 +994,9 @@ public int getTimeout() {
        * @return This builder for chaining.
        */
       public Builder setTimeout(int value) {
-        bitField0_ |= 0x00000004;
+
         timeout_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1064,11 +1041,11 @@ public Builder setRequest(org.apache.pekko.cluster.ddata.protobuf.msg.Replicator
             throw new NullPointerException();
           }
           request_ = value;
-          onChanged();
         } else {
           requestBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000008;
+        onChanged();
         return this;
       }
       /**
@@ -1078,11 +1055,11 @@ public Builder setRequest(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (requestBuilder_ == null) {
           request_ = builderForValue.build();
-          onChanged();
         } else {
           requestBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000008;
+        onChanged();
         return this;
       }
       /**
@@ -1091,31 +1068,32 @@ public Builder setRequest(
       public Builder mergeRequest(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (requestBuilder_ == null) {
           if (((bitField0_ & 0x00000008) != 0) &&
-              request_ != null &&
-              request_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-            request_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(request_).mergeFrom(value).buildPartial();
+            request_ != null &&
+            request_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+            getRequestBuilder().mergeFrom(value);
           } else {
             request_ = value;
           }
-          onChanged();
         } else {
           requestBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000008;
+        if (request_ != null) {
+          bitField0_ |= 0x00000008;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
        */
       public Builder clearRequest() {
-        if (requestBuilder_ == null) {
-          request_ = null;
-          onChanged();
-        } else {
-          requestBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000008);
+        request_ = null;
+        if (requestBuilder_ != null) {
+          requestBuilder_.dispose();
+          requestBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -1159,6 +1137,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessa
        * optional int32 consistencyMinCap = 5;
        * @return Whether the consistencyMinCap field is set.
        */
+      @java.lang.Override
       public boolean hasConsistencyMinCap() {
         return ((bitField0_ & 0x00000010) != 0);
       }
@@ -1166,6 +1145,7 @@ public boolean hasConsistencyMinCap() {
        * optional int32 consistencyMinCap = 5;
        * @return The consistencyMinCap.
        */
+      @java.lang.Override
       public int getConsistencyMinCap() {
         return consistencyMinCap_;
       }
@@ -1175,8 +1155,9 @@ public int getConsistencyMinCap() {
        * @return This builder for chaining.
        */
       public Builder setConsistencyMinCap(int value) {
-        bitField0_ |= 0x00000010;
+
         consistencyMinCap_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1196,6 +1177,7 @@ public Builder clearConsistencyMinCap() {
        * optional int32 consistencyAdditional = 6;
        * @return Whether the consistencyAdditional field is set.
        */
+      @java.lang.Override
       public boolean hasConsistencyAdditional() {
         return ((bitField0_ & 0x00000020) != 0);
       }
@@ -1203,6 +1185,7 @@ public boolean hasConsistencyAdditional() {
        * optional int32 consistencyAdditional = 6;
        * @return The consistencyAdditional.
        */
+      @java.lang.Override
       public int getConsistencyAdditional() {
         return consistencyAdditional_;
       }
@@ -1212,8 +1195,9 @@ public int getConsistencyAdditional() {
        * @return This builder for chaining.
        */
       public Builder setConsistencyAdditional(int value) {
-        bitField0_ |= 0x00000020;
+
         consistencyAdditional_ = value;
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -1260,7 +1244,18 @@ public Get parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Get(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -1332,7 +1327,7 @@ public interface GetSuccessOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.GetSuccess}
    */
-  public  static final class GetSuccess extends
+  public static final class GetSuccess extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.GetSuccess)
       GetSuccessOrBuilder {
@@ -1351,88 +1346,6 @@ protected java.lang.Object newInstance(
       return new GetSuccess();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private GetSuccess(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = key_.toBuilder();
-              }
-              key_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(key_);
-                key_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = data_.toBuilder();
-              }
-              data_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(data_);
-                data_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            case 34: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000004) != 0)) {
-                subBuilder = request_.toBuilder();
-              }
-              request_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(request_);
-                request_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000004;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_GetSuccess_descriptor;
@@ -1453,6 +1366,7 @@ private GetSuccess(
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
+    @java.lang.Override
     public boolean hasKey() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -1460,12 +1374,14 @@ public boolean hasKey() {
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
       return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
       return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
@@ -1476,6 +1392,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessa
      * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
      * @return Whether the data field is set.
      */
+    @java.lang.Override
     public boolean hasData() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -1483,12 +1400,14 @@ public boolean hasData() {
      * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
      * @return The data.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData() {
       return data_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder() {
       return data_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
     }
@@ -1499,6 +1418,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessa
      * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
      * @return Whether the request field is set.
      */
+    @java.lang.Override
     public boolean hasRequest() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -1506,12 +1426,14 @@ public boolean hasRequest() {
      * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
      * @return The request.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest() {
       return request_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
     }
     /**
      * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder() {
       return request_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
     }
@@ -1561,7 +1483,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeMessage(4, getRequest());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -1582,7 +1504,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(4, getRequest());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1612,7 +1534,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getRequest()
             .equals(other.getRequest())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1635,7 +1557,7 @@ public int hashCode() {
         hash = (37 * hash) + REQUEST_FIELD_NUMBER;
         hash = (53 * hash) + getRequest().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1684,11 +1606,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -1771,24 +1695,22 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (keyBuilder_ == null) {
-          key_ = null;
-        } else {
-          keyBuilder_.clear();
+        bitField0_ = 0;
+        key_ = null;
+        if (keyBuilder_ != null) {
+          keyBuilder_.dispose();
+          keyBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (dataBuilder_ == null) {
-          data_ = null;
-        } else {
-          dataBuilder_.clear();
+        data_ = null;
+        if (dataBuilder_ != null) {
+          dataBuilder_.dispose();
+          dataBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        if (requestBuilder_ == null) {
-          request_ = null;
-        } else {
-          requestBuilder_.clear();
+        request_ = null;
+        if (requestBuilder_ != null) {
+          requestBuilder_.dispose();
+          requestBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -1815,35 +1737,33 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (keyBuilder_ == null) {
-            result.key_ = key_;
-          } else {
-            result.key_ = keyBuilder_.build();
-          }
+          result.key_ = keyBuilder_ == null
+              ? key_
+              : keyBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (dataBuilder_ == null) {
-            result.data_ = data_;
-          } else {
-            result.data_ = dataBuilder_.build();
-          }
+          result.data_ = dataBuilder_ == null
+              ? data_
+              : dataBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
-          if (requestBuilder_ == null) {
-            result.request_ = request_;
-          } else {
-            result.request_ = requestBuilder_.build();
-          }
+          result.request_ = requestBuilder_ == null
+              ? request_
+              : requestBuilder_.build();
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1899,7 +1819,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
         if (other.hasRequest()) {
           mergeRequest(other.getRequest());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1931,17 +1851,51 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getKeyFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getDataFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 34: {
+                input.readMessage(
+                    getRequestFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 34
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -1976,11 +1930,11 @@ public Builder setKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMess
             throw new NullPointerException();
           }
           key_ = value;
-          onChanged();
         } else {
           keyBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1990,11 +1944,11 @@ public Builder setKey(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (keyBuilder_ == null) {
           key_ = builderForValue.build();
-          onChanged();
         } else {
           keyBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -2003,31 +1957,32 @@ public Builder setKey(
       public Builder mergeKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              key_ != null &&
-              key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-            key_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
+            key_ != null &&
+            key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+            getKeyBuilder().mergeFrom(value);
           } else {
             key_ = value;
           }
-          onChanged();
         } else {
           keyBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (key_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder clearKey() {
-        if (keyBuilder_ == null) {
-          key_ = null;
-          onChanged();
-        } else {
-          keyBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        key_ = null;
+        if (keyBuilder_ != null) {
+          keyBuilder_.dispose();
+          keyBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -2096,11 +2051,11 @@ public Builder setData(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMes
             throw new NullPointerException();
           }
           data_ = value;
-          onChanged();
         } else {
           dataBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -2110,11 +2065,11 @@ public Builder setData(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (dataBuilder_ == null) {
           data_ = builderForValue.build();
-          onChanged();
         } else {
           dataBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -2123,31 +2078,32 @@ public Builder setData(
       public Builder mergeData(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (dataBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              data_ != null &&
-              data_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-            data_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(data_).mergeFrom(value).buildPartial();
+            data_ != null &&
+            data_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+            getDataBuilder().mergeFrom(value);
           } else {
             data_ = value;
           }
-          onChanged();
         } else {
           dataBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (data_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
        */
       public Builder clearData() {
-        if (dataBuilder_ == null) {
-          data_ = null;
-          onChanged();
-        } else {
-          dataBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        data_ = null;
+        if (dataBuilder_ != null) {
+          dataBuilder_.dispose();
+          dataBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -2216,11 +2172,11 @@ public Builder setRequest(org.apache.pekko.cluster.ddata.protobuf.msg.Replicator
             throw new NullPointerException();
           }
           request_ = value;
-          onChanged();
         } else {
           requestBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -2230,11 +2186,11 @@ public Builder setRequest(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (requestBuilder_ == null) {
           request_ = builderForValue.build();
-          onChanged();
         } else {
           requestBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -2243,31 +2199,32 @@ public Builder setRequest(
       public Builder mergeRequest(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (requestBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
-              request_ != null &&
-              request_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-            request_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(request_).mergeFrom(value).buildPartial();
+            request_ != null &&
+            request_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+            getRequestBuilder().mergeFrom(value);
           } else {
             request_ = value;
           }
-          onChanged();
         } else {
           requestBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000004;
+        if (request_ != null) {
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
        */
       public Builder clearRequest() {
-        if (requestBuilder_ == null) {
-          request_ = null;
-          onChanged();
-        } else {
-          requestBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000004);
+        request_ = null;
+        if (requestBuilder_ != null) {
+          requestBuilder_.dispose();
+          requestBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -2338,7 +2295,18 @@ public GetSuccess parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new GetSuccess(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -2395,7 +2363,7 @@ public interface NotFoundOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.NotFound}
    */
-  public  static final class NotFound extends
+  public static final class NotFound extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.NotFound)
       NotFoundOrBuilder {
@@ -2414,75 +2382,6 @@ protected java.lang.Object newInstance(
       return new NotFound();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private NotFound(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = key_.toBuilder();
-              }
-              key_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(key_);
-                key_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = request_.toBuilder();
-              }
-              request_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(request_);
-                request_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_NotFound_descriptor;
@@ -2503,6 +2402,7 @@ private NotFound(
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
+    @java.lang.Override
     public boolean hasKey() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -2510,12 +2410,14 @@ public boolean hasKey() {
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
       return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
       return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
@@ -2526,6 +2428,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessa
      * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
      * @return Whether the request field is set.
      */
+    @java.lang.Override
     public boolean hasRequest() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -2533,12 +2436,14 @@ public boolean hasRequest() {
      * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
      * @return The request.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest() {
       return request_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
     }
     /**
      * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder() {
       return request_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
     }
@@ -2577,7 +2482,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getRequest());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -2594,7 +2499,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getRequest());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2619,7 +2524,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getRequest()
             .equals(other.getRequest())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -2638,7 +2543,7 @@ public int hashCode() {
         hash = (37 * hash) + REQUEST_FIELD_NUMBER;
         hash = (53 * hash) + getRequest().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -2687,11 +2592,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Not
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -2773,18 +2680,17 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (keyBuilder_ == null) {
-          key_ = null;
-        } else {
-          keyBuilder_.clear();
+        bitField0_ = 0;
+        key_ = null;
+        if (keyBuilder_ != null) {
+          keyBuilder_.dispose();
+          keyBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (requestBuilder_ == null) {
-          request_ = null;
-        } else {
-          requestBuilder_.clear();
+        request_ = null;
+        if (requestBuilder_ != null) {
+          requestBuilder_.dispose();
+          requestBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -2811,27 +2717,27 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound b
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (keyBuilder_ == null) {
-            result.key_ = key_;
-          } else {
-            result.key_ = keyBuilder_.build();
-          }
+          result.key_ = keyBuilder_ == null
+              ? key_
+              : keyBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (requestBuilder_ == null) {
-            result.request_ = request_;
-          } else {
-            result.request_ = requestBuilder_.build();
-          }
+          result.request_ = requestBuilder_ == null
+              ? request_
+              : requestBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -2884,7 +2790,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
         if (other.hasRequest()) {
           mergeRequest(other.getRequest());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -2910,17 +2816,44 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getKeyFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getRequestFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -2955,11 +2888,11 @@ public Builder setKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMess
             throw new NullPointerException();
           }
           key_ = value;
-          onChanged();
         } else {
           keyBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -2969,11 +2902,11 @@ public Builder setKey(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (keyBuilder_ == null) {
           key_ = builderForValue.build();
-          onChanged();
         } else {
           keyBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -2982,31 +2915,32 @@ public Builder setKey(
       public Builder mergeKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              key_ != null &&
-              key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-            key_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
+            key_ != null &&
+            key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+            getKeyBuilder().mergeFrom(value);
           } else {
             key_ = value;
           }
-          onChanged();
         } else {
           keyBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (key_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder clearKey() {
-        if (keyBuilder_ == null) {
-          key_ = null;
-          onChanged();
-        } else {
-          keyBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        key_ = null;
+        if (keyBuilder_ != null) {
+          keyBuilder_.dispose();
+          keyBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -3075,11 +3009,11 @@ public Builder setRequest(org.apache.pekko.cluster.ddata.protobuf.msg.Replicator
             throw new NullPointerException();
           }
           request_ = value;
-          onChanged();
         } else {
           requestBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -3089,11 +3023,11 @@ public Builder setRequest(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (requestBuilder_ == null) {
           request_ = builderForValue.build();
-          onChanged();
         } else {
           requestBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -3102,31 +3036,32 @@ public Builder setRequest(
       public Builder mergeRequest(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (requestBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              request_ != null &&
-              request_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-            request_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(request_).mergeFrom(value).buildPartial();
+            request_ != null &&
+            request_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+            getRequestBuilder().mergeFrom(value);
           } else {
             request_ = value;
           }
-          onChanged();
         } else {
           requestBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (request_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
        */
       public Builder clearRequest() {
-        if (requestBuilder_ == null) {
-          request_ = null;
-          onChanged();
-        } else {
-          requestBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        request_ = null;
+        if (requestBuilder_ != null) {
+          requestBuilder_.dispose();
+          requestBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -3197,7 +3132,18 @@ public NotFound parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new NotFound(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -3254,7 +3200,7 @@ public interface GetFailureOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.GetFailure}
    */
-  public  static final class GetFailure extends
+  public static final class GetFailure extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.GetFailure)
       GetFailureOrBuilder {
@@ -3273,75 +3219,6 @@ protected java.lang.Object newInstance(
       return new GetFailure();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private GetFailure(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = key_.toBuilder();
-              }
-              key_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(key_);
-                key_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = request_.toBuilder();
-              }
-              request_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(request_);
-                request_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_GetFailure_descriptor;
@@ -3362,6 +3239,7 @@ private GetFailure(
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
+    @java.lang.Override
     public boolean hasKey() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -3369,12 +3247,14 @@ public boolean hasKey() {
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
       return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
       return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
@@ -3385,6 +3265,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessa
      * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
      * @return Whether the request field is set.
      */
+    @java.lang.Override
     public boolean hasRequest() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -3392,12 +3273,14 @@ public boolean hasRequest() {
      * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
      * @return The request.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest() {
       return request_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
     }
     /**
      * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder() {
       return request_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
     }
@@ -3436,7 +3319,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getRequest());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -3453,7 +3336,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getRequest());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -3478,7 +3361,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getRequest()
             .equals(other.getRequest())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -3497,7 +3380,7 @@ public int hashCode() {
         hash = (37 * hash) + REQUEST_FIELD_NUMBER;
         hash = (53 * hash) + getRequest().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3546,11 +3429,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -3632,18 +3517,17 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (keyBuilder_ == null) {
-          key_ = null;
-        } else {
-          keyBuilder_.clear();
+        bitField0_ = 0;
+        key_ = null;
+        if (keyBuilder_ != null) {
+          keyBuilder_.dispose();
+          keyBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (requestBuilder_ == null) {
-          request_ = null;
-        } else {
-          requestBuilder_.clear();
+        request_ = null;
+        if (requestBuilder_ != null) {
+          requestBuilder_.dispose();
+          requestBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -3670,27 +3554,27 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (keyBuilder_ == null) {
-            result.key_ = key_;
-          } else {
-            result.key_ = keyBuilder_.build();
-          }
+          result.key_ = keyBuilder_ == null
+              ? key_
+              : keyBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (requestBuilder_ == null) {
-            result.request_ = request_;
-          } else {
-            result.request_ = requestBuilder_.build();
-          }
+          result.request_ = requestBuilder_ == null
+              ? request_
+              : requestBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -3743,7 +3627,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
         if (other.hasRequest()) {
           mergeRequest(other.getRequest());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -3769,17 +3653,44 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getKeyFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getRequestFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -3814,11 +3725,11 @@ public Builder setKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMess
             throw new NullPointerException();
           }
           key_ = value;
-          onChanged();
         } else {
           keyBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -3828,11 +3739,11 @@ public Builder setKey(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (keyBuilder_ == null) {
           key_ = builderForValue.build();
-          onChanged();
         } else {
           keyBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -3841,31 +3752,32 @@ public Builder setKey(
       public Builder mergeKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              key_ != null &&
-              key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-            key_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
+            key_ != null &&
+            key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+            getKeyBuilder().mergeFrom(value);
           } else {
             key_ = value;
           }
-          onChanged();
         } else {
           keyBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (key_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder clearKey() {
-        if (keyBuilder_ == null) {
-          key_ = null;
-          onChanged();
-        } else {
-          keyBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        key_ = null;
+        if (keyBuilder_ != null) {
+          keyBuilder_.dispose();
+          keyBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -3934,11 +3846,11 @@ public Builder setRequest(org.apache.pekko.cluster.ddata.protobuf.msg.Replicator
             throw new NullPointerException();
           }
           request_ = value;
-          onChanged();
         } else {
           requestBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -3948,11 +3860,11 @@ public Builder setRequest(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (requestBuilder_ == null) {
           request_ = builderForValue.build();
-          onChanged();
         } else {
           requestBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -3961,31 +3873,32 @@ public Builder setRequest(
       public Builder mergeRequest(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (requestBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              request_ != null &&
-              request_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-            request_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(request_).mergeFrom(value).buildPartial();
+            request_ != null &&
+            request_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+            getRequestBuilder().mergeFrom(value);
           } else {
             request_ = value;
           }
-          onChanged();
         } else {
           requestBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (request_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
        */
       public Builder clearRequest() {
-        if (requestBuilder_ == null) {
-          request_ = null;
-          onChanged();
-        } else {
-          requestBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        request_ = null;
+        if (requestBuilder_ != null) {
+          requestBuilder_.dispose();
+          requestBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -4056,7 +3969,18 @@ public GetFailure parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new GetFailure(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -4115,7 +4039,7 @@ public interface SubscribeOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.Subscribe}
    */
-  public  static final class Subscribe extends
+  public static final class Subscribe extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Subscribe)
       SubscribeOrBuilder {
@@ -4135,71 +4059,9 @@ protected java.lang.Object newInstance(
       return new Subscribe();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Subscribe(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = key_.toBuilder();
-              }
-              key_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(key_);
-                key_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              ref_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
-        getDescriptor() {
-      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_Subscribe_descriptor;
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+        getDescriptor() {
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_Subscribe_descriptor;
     }
 
     @java.lang.Override
@@ -4217,6 +4079,7 @@ private Subscribe(
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
+    @java.lang.Override
     public boolean hasKey() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -4224,22 +4087,26 @@ public boolean hasKey() {
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
       return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
       return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
 
     public static final int REF_FIELD_NUMBER = 2;
-    private volatile java.lang.Object ref_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object ref_ = "";
     /**
      * required string ref = 2;
      * @return Whether the ref field is set.
      */
+    @java.lang.Override
     public boolean hasRef() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -4247,6 +4114,7 @@ public boolean hasRef() {
      * required string ref = 2;
      * @return The ref.
      */
+    @java.lang.Override
     public java.lang.String getRef() {
       java.lang.Object ref = ref_;
       if (ref instanceof java.lang.String) {
@@ -4265,6 +4133,7 @@ public java.lang.String getRef() {
      * required string ref = 2;
      * @return The bytes for ref.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getRefBytes() {
       java.lang.Object ref = ref_;
@@ -4311,7 +4180,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, ref_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -4327,7 +4196,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000002) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, ref_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4352,7 +4221,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getRef()
             .equals(other.getRef())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -4371,7 +4240,7 @@ public int hashCode() {
         hash = (37 * hash) + REF_FIELD_NUMBER;
         hash = (53 * hash) + getRef().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4420,11 +4289,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Sub
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -4505,14 +4376,13 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (keyBuilder_ == null) {
-          key_ = null;
-        } else {
-          keyBuilder_.clear();
+        bitField0_ = 0;
+        key_ = null;
+        if (keyBuilder_ != null) {
+          keyBuilder_.dispose();
+          keyBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         ref_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -4539,23 +4409,25 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (keyBuilder_ == null) {
-            result.key_ = key_;
-          } else {
-            result.key_ = keyBuilder_.build();
-          }
+          result.key_ = keyBuilder_ == null
+              ? key_
+              : keyBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.ref_ = ref_;
           to_bitField0_ |= 0x00000002;
         }
-        result.ref_ = ref_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -4606,11 +4478,11 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
           mergeKey(other.getKey());
         }
         if (other.hasRef()) {
-          bitField0_ |= 0x00000002;
           ref_ = other.ref_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -4634,17 +4506,42 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getKeyFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                ref_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -4679,11 +4576,11 @@ public Builder setKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMess
             throw new NullPointerException();
           }
           key_ = value;
-          onChanged();
         } else {
           keyBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -4693,11 +4590,11 @@ public Builder setKey(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (keyBuilder_ == null) {
           key_ = builderForValue.build();
-          onChanged();
         } else {
           keyBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -4706,31 +4603,32 @@ public Builder setKey(
       public Builder mergeKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              key_ != null &&
-              key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-            key_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
+            key_ != null &&
+            key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+            getKeyBuilder().mergeFrom(value);
           } else {
             key_ = value;
           }
-          onChanged();
         } else {
           keyBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (key_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder clearKey() {
-        if (keyBuilder_ == null) {
-          key_ = null;
-          onChanged();
-        } else {
-          keyBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        key_ = null;
+        if (keyBuilder_ != null) {
+          keyBuilder_.dispose();
+          keyBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -4819,11 +4717,9 @@ public java.lang.String getRef() {
        */
       public Builder setRef(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         ref_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4832,8 +4728,8 @@ public Builder setRef(
        * @return This builder for chaining.
        */
       public Builder clearRef() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         ref_ = getDefaultInstance().getRef();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -4844,11 +4740,9 @@ public Builder clearRef() {
        */
       public Builder setRefBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         ref_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4885,7 +4779,18 @@ public Subscribe parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Subscribe(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -4944,7 +4849,7 @@ public interface UnsubscribeOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.Unsubscribe}
    */
-  public  static final class Unsubscribe extends
+  public static final class Unsubscribe extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Unsubscribe)
       UnsubscribeOrBuilder {
@@ -4964,68 +4869,6 @@ protected java.lang.Object newInstance(
       return new Unsubscribe();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Unsubscribe(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = key_.toBuilder();
-              }
-              key_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(key_);
-                key_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              ref_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_Unsubscribe_descriptor;
@@ -5046,6 +4889,7 @@ private Unsubscribe(
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
+    @java.lang.Override
     public boolean hasKey() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -5053,22 +4897,26 @@ public boolean hasKey() {
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
       return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
       return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
 
     public static final int REF_FIELD_NUMBER = 2;
-    private volatile java.lang.Object ref_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object ref_ = "";
     /**
      * required string ref = 2;
      * @return Whether the ref field is set.
      */
+    @java.lang.Override
     public boolean hasRef() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -5076,6 +4924,7 @@ public boolean hasRef() {
      * required string ref = 2;
      * @return The ref.
      */
+    @java.lang.Override
     public java.lang.String getRef() {
       java.lang.Object ref = ref_;
       if (ref instanceof java.lang.String) {
@@ -5094,6 +4943,7 @@ public java.lang.String getRef() {
      * required string ref = 2;
      * @return The bytes for ref.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getRefBytes() {
       java.lang.Object ref = ref_;
@@ -5140,7 +4990,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, ref_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -5156,7 +5006,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000002) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, ref_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5181,7 +5031,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getRef()
             .equals(other.getRef())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -5200,7 +5050,7 @@ public int hashCode() {
         hash = (37 * hash) + REF_FIELD_NUMBER;
         hash = (53 * hash) + getRef().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -5249,11 +5099,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Uns
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -5334,14 +5186,13 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (keyBuilder_ == null) {
-          key_ = null;
-        } else {
-          keyBuilder_.clear();
+        bitField0_ = 0;
+        key_ = null;
+        if (keyBuilder_ != null) {
+          keyBuilder_.dispose();
+          keyBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         ref_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -5368,23 +5219,25 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscrib
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (keyBuilder_ == null) {
-            result.key_ = key_;
-          } else {
-            result.key_ = keyBuilder_.build();
-          }
+          result.key_ = keyBuilder_ == null
+              ? key_
+              : keyBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.ref_ = ref_;
           to_bitField0_ |= 0x00000002;
         }
-        result.ref_ = ref_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -5435,11 +5288,11 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
           mergeKey(other.getKey());
         }
         if (other.hasRef()) {
-          bitField0_ |= 0x00000002;
           ref_ = other.ref_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -5463,17 +5316,42 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getKeyFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                ref_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -5508,11 +5386,11 @@ public Builder setKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMess
             throw new NullPointerException();
           }
           key_ = value;
-          onChanged();
         } else {
           keyBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -5522,11 +5400,11 @@ public Builder setKey(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (keyBuilder_ == null) {
           key_ = builderForValue.build();
-          onChanged();
         } else {
           keyBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -5535,31 +5413,32 @@ public Builder setKey(
       public Builder mergeKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              key_ != null &&
-              key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-            key_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
+            key_ != null &&
+            key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+            getKeyBuilder().mergeFrom(value);
           } else {
             key_ = value;
           }
-          onChanged();
         } else {
           keyBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (key_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder clearKey() {
-        if (keyBuilder_ == null) {
-          key_ = null;
-          onChanged();
-        } else {
-          keyBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        key_ = null;
+        if (keyBuilder_ != null) {
+          keyBuilder_.dispose();
+          keyBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -5648,11 +5527,9 @@ public java.lang.String getRef() {
        */
       public Builder setRef(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         ref_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -5661,8 +5538,8 @@ public Builder setRef(
        * @return This builder for chaining.
        */
       public Builder clearRef() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         ref_ = getDefaultInstance().getRef();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -5673,11 +5550,9 @@ public Builder clearRef() {
        */
       public Builder setRefBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         ref_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -5714,7 +5589,18 @@ public Unsubscribe parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Unsubscribe(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -5771,7 +5657,7 @@ public interface ChangedOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.Changed}
    */
-  public  static final class Changed extends
+  public static final class Changed extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Changed)
       ChangedOrBuilder {
@@ -5790,75 +5676,6 @@ protected java.lang.Object newInstance(
       return new Changed();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Changed(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = key_.toBuilder();
-              }
-              key_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(key_);
-                key_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = data_.toBuilder();
-              }
-              data_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(data_);
-                data_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_Changed_descriptor;
@@ -5879,6 +5696,7 @@ private Changed(
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
+    @java.lang.Override
     public boolean hasKey() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -5886,12 +5704,14 @@ public boolean hasKey() {
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
       return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
       return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
@@ -5902,6 +5722,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessa
      * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
      * @return Whether the data field is set.
      */
+    @java.lang.Override
     public boolean hasData() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -5909,12 +5730,14 @@ public boolean hasData() {
      * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
      * @return The data.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData() {
       return data_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder() {
       return data_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
     }
@@ -5955,7 +5778,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getData());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -5972,7 +5795,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getData());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5997,7 +5820,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getData()
             .equals(other.getData())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -6016,7 +5839,7 @@ public int hashCode() {
         hash = (37 * hash) + DATA_FIELD_NUMBER;
         hash = (53 * hash) + getData().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -6065,11 +5888,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Cha
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -6151,18 +5976,17 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (keyBuilder_ == null) {
-          key_ = null;
-        } else {
-          keyBuilder_.clear();
+        bitField0_ = 0;
+        key_ = null;
+        if (keyBuilder_ != null) {
+          keyBuilder_.dispose();
+          keyBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (dataBuilder_ == null) {
-          data_ = null;
-        } else {
-          dataBuilder_.clear();
+        data_ = null;
+        if (dataBuilder_ != null) {
+          dataBuilder_.dispose();
+          dataBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -6189,27 +6013,27 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed bu
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (keyBuilder_ == null) {
-            result.key_ = key_;
-          } else {
-            result.key_ = keyBuilder_.build();
-          }
+          result.key_ = keyBuilder_ == null
+              ? key_
+              : keyBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (dataBuilder_ == null) {
-            result.data_ = data_;
-          } else {
-            result.data_ = dataBuilder_.build();
-          }
+          result.data_ = dataBuilder_ == null
+              ? data_
+              : dataBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -6262,7 +6086,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
         if (other.hasData()) {
           mergeData(other.getData());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -6289,17 +6113,44 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getKeyFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getDataFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -6334,11 +6185,11 @@ public Builder setKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMess
             throw new NullPointerException();
           }
           key_ = value;
-          onChanged();
         } else {
           keyBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -6348,11 +6199,11 @@ public Builder setKey(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (keyBuilder_ == null) {
           key_ = builderForValue.build();
-          onChanged();
         } else {
           keyBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -6361,31 +6212,32 @@ public Builder setKey(
       public Builder mergeKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              key_ != null &&
-              key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-            key_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
+            key_ != null &&
+            key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+            getKeyBuilder().mergeFrom(value);
           } else {
             key_ = value;
           }
-          onChanged();
         } else {
           keyBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
-        return this;
+        if (key_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
+        return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder clearKey() {
-        if (keyBuilder_ == null) {
-          key_ = null;
-          onChanged();
-        } else {
-          keyBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        key_ = null;
+        if (keyBuilder_ != null) {
+          keyBuilder_.dispose();
+          keyBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -6454,11 +6306,11 @@ public Builder setData(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMes
             throw new NullPointerException();
           }
           data_ = value;
-          onChanged();
         } else {
           dataBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -6468,11 +6320,11 @@ public Builder setData(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (dataBuilder_ == null) {
           data_ = builderForValue.build();
-          onChanged();
         } else {
           dataBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -6481,31 +6333,32 @@ public Builder setData(
       public Builder mergeData(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (dataBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              data_ != null &&
-              data_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-            data_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(data_).mergeFrom(value).buildPartial();
+            data_ != null &&
+            data_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+            getDataBuilder().mergeFrom(value);
           } else {
             data_ = value;
           }
-          onChanged();
         } else {
           dataBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (data_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
        */
       public Builder clearData() {
-        if (dataBuilder_ == null) {
-          data_ = null;
-          onChanged();
-        } else {
-          dataBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        data_ = null;
+        if (dataBuilder_ != null) {
+          dataBuilder_.dispose();
+          dataBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -6576,7 +6429,18 @@ public Changed parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Changed(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -6650,7 +6514,7 @@ public interface WriteOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.Write}
    */
-  public  static final class Write extends
+  public static final class Write extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Write)
       WriteOrBuilder {
@@ -6670,81 +6534,6 @@ protected java.lang.Object newInstance(
       return new Write();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Write(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              key_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = envelope_.toBuilder();
-              }
-              envelope_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(envelope_);
-                envelope_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            case 26: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000004) != 0)) {
-                subBuilder = fromNode_.toBuilder();
-              }
-              fromNode_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(fromNode_);
-                fromNode_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000004;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_Write_descriptor;
@@ -6760,11 +6549,13 @@ private Write(
 
     private int bitField0_;
     public static final int KEY_FIELD_NUMBER = 1;
-    private volatile java.lang.Object key_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object key_ = "";
     /**
      * required string key = 1;
      * @return Whether the key field is set.
      */
+    @java.lang.Override
     public boolean hasKey() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -6772,6 +6563,7 @@ public boolean hasKey() {
      * required string key = 1;
      * @return The key.
      */
+    @java.lang.Override
     public java.lang.String getKey() {
       java.lang.Object ref = key_;
       if (ref instanceof java.lang.String) {
@@ -6790,6 +6582,7 @@ public java.lang.String getKey() {
      * required string key = 1;
      * @return The bytes for key.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getKeyBytes() {
       java.lang.Object ref = key_;
@@ -6810,6 +6603,7 @@ public java.lang.String getKey() {
      * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
      * @return Whether the envelope field is set.
      */
+    @java.lang.Override
     public boolean hasEnvelope() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -6817,12 +6611,14 @@ public boolean hasEnvelope() {
      * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
      * @return The envelope.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope() {
       return envelope_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder() {
       return envelope_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
     }
@@ -6833,6 +6629,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelo
      * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 3;
      * @return Whether the fromNode field is set.
      */
+    @java.lang.Override
     public boolean hasFromNode() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -6840,12 +6637,14 @@ public boolean hasFromNode() {
      * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 3;
      * @return The fromNode.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode() {
       return fromNode_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
     }
     /**
      * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 3;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder() {
       return fromNode_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
     }
@@ -6891,7 +6690,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeMessage(3, getFromNode());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -6911,7 +6710,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, getFromNode());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -6941,7 +6740,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getFromNode()
             .equals(other.getFromNode())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -6964,7 +6763,7 @@ public int hashCode() {
         hash = (37 * hash) + FROMNODE_FIELD_NUMBER;
         hash = (53 * hash) + getFromNode().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -7013,11 +6812,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Wri
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -7099,20 +6900,18 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         key_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (envelopeBuilder_ == null) {
-          envelope_ = null;
-        } else {
-          envelopeBuilder_.clear();
+        envelope_ = null;
+        if (envelopeBuilder_ != null) {
+          envelopeBuilder_.dispose();
+          envelopeBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        if (fromNodeBuilder_ == null) {
-          fromNode_ = null;
-        } else {
-          fromNodeBuilder_.clear();
+        fromNode_ = null;
+        if (fromNodeBuilder_ != null) {
+          fromNodeBuilder_.dispose();
+          fromNodeBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -7139,31 +6938,31 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write buil
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.key_ = key_;
           to_bitField0_ |= 0x00000001;
         }
-        result.key_ = key_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (envelopeBuilder_ == null) {
-            result.envelope_ = envelope_;
-          } else {
-            result.envelope_ = envelopeBuilder_.build();
-          }
+          result.envelope_ = envelopeBuilder_ == null
+              ? envelope_
+              : envelopeBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
-          if (fromNodeBuilder_ == null) {
-            result.fromNode_ = fromNode_;
-          } else {
-            result.fromNode_ = fromNodeBuilder_.build();
-          }
+          result.fromNode_ = fromNodeBuilder_ == null
+              ? fromNode_
+              : fromNodeBuilder_.build();
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -7211,8 +7010,8 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write other) {
         if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write.getDefaultInstance()) return this;
         if (other.hasKey()) {
-          bitField0_ |= 0x00000001;
           key_ = other.key_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasEnvelope()) {
@@ -7221,7 +7020,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
         if (other.hasFromNode()) {
           mergeFromNode(other.getFromNode());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -7250,17 +7049,49 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                key_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getEnvelopeFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 26: {
+                input.readMessage(
+                    getFromNodeFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -7315,11 +7146,9 @@ public java.lang.String getKey() {
        */
       public Builder setKey(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         key_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -7328,8 +7157,8 @@ public Builder setKey(
        * @return This builder for chaining.
        */
       public Builder clearKey() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         key_ = getDefaultInstance().getKey();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -7340,11 +7169,9 @@ public Builder clearKey() {
        */
       public Builder setKeyBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         key_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -7379,11 +7206,11 @@ public Builder setEnvelope(org.apache.pekko.cluster.ddata.protobuf.msg.Replicato
             throw new NullPointerException();
           }
           envelope_ = value;
-          onChanged();
         } else {
           envelopeBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -7393,11 +7220,11 @@ public Builder setEnvelope(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder builderForValue) {
         if (envelopeBuilder_ == null) {
           envelope_ = builderForValue.build();
-          onChanged();
         } else {
           envelopeBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -7406,31 +7233,32 @@ public Builder setEnvelope(
       public Builder mergeEnvelope(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope value) {
         if (envelopeBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              envelope_ != null &&
-              envelope_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance()) {
-            envelope_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.newBuilder(envelope_).mergeFrom(value).buildPartial();
+            envelope_ != null &&
+            envelope_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance()) {
+            getEnvelopeBuilder().mergeFrom(value);
           } else {
             envelope_ = value;
           }
-          onChanged();
         } else {
           envelopeBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (envelope_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        */
       public Builder clearEnvelope() {
-        if (envelopeBuilder_ == null) {
-          envelope_ = null;
-          onChanged();
-        } else {
-          envelopeBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        envelope_ = null;
+        if (envelopeBuilder_ != null) {
+          envelopeBuilder_.dispose();
+          envelopeBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -7499,11 +7327,11 @@ public Builder setFromNode(org.apache.pekko.cluster.ddata.protobuf.msg.Replicato
             throw new NullPointerException();
           }
           fromNode_ = value;
-          onChanged();
         } else {
           fromNodeBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -7513,11 +7341,11 @@ public Builder setFromNode(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
         if (fromNodeBuilder_ == null) {
           fromNode_ = builderForValue.build();
-          onChanged();
         } else {
           fromNodeBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -7526,31 +7354,32 @@ public Builder setFromNode(
       public Builder mergeFromNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
         if (fromNodeBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
-              fromNode_ != null &&
-              fromNode_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
-            fromNode_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(fromNode_).mergeFrom(value).buildPartial();
+            fromNode_ != null &&
+            fromNode_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
+            getFromNodeBuilder().mergeFrom(value);
           } else {
             fromNode_ = value;
           }
-          onChanged();
         } else {
           fromNodeBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000004;
+        if (fromNode_ != null) {
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 3;
        */
       public Builder clearFromNode() {
-        if (fromNodeBuilder_ == null) {
-          fromNode_ = null;
-          onChanged();
-        } else {
-          fromNodeBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000004);
+        fromNode_ = null;
+        if (fromNodeBuilder_ != null) {
+          fromNodeBuilder_.dispose();
+          fromNodeBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -7621,7 +7450,18 @@ public Write parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Write(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -7648,7 +7488,7 @@ public interface EmptyOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.Empty}
    */
-  public  static final class Empty extends
+  public static final class Empty extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Empty)
       EmptyOrBuilder {
@@ -7667,48 +7507,6 @@ protected java.lang.Object newInstance(
       return new Empty();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Empty(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_Empty_descriptor;
@@ -7736,7 +7534,7 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -7745,7 +7543,7 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -7760,7 +7558,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty) obj;
 
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -7771,7 +7569,7 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -7820,11 +7618,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Emp
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -7888,18 +7688,13 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
@@ -7978,7 +7773,7 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
 
       public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty other) {
         if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty.getDefaultInstance()) return this;
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -7993,17 +7788,30 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       @java.lang.Override
@@ -8039,7 +7847,18 @@ public Empty parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Empty(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -8098,7 +7917,7 @@ public interface ReadOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.Read}
    */
-  public  static final class Read extends
+  public static final class Read extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Read)
       ReadOrBuilder {
@@ -8118,68 +7937,6 @@ protected java.lang.Object newInstance(
       return new Read();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Read(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              key_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = fromNode_.toBuilder();
-              }
-              fromNode_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(fromNode_);
-                fromNode_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_Read_descriptor;
@@ -8195,11 +7952,13 @@ private Read(
 
     private int bitField0_;
     public static final int KEY_FIELD_NUMBER = 1;
-    private volatile java.lang.Object key_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object key_ = "";
     /**
      * required string key = 1;
      * @return Whether the key field is set.
      */
+    @java.lang.Override
     public boolean hasKey() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -8207,6 +7966,7 @@ public boolean hasKey() {
      * required string key = 1;
      * @return The key.
      */
+    @java.lang.Override
     public java.lang.String getKey() {
       java.lang.Object ref = key_;
       if (ref instanceof java.lang.String) {
@@ -8225,6 +7985,7 @@ public java.lang.String getKey() {
      * required string key = 1;
      * @return The bytes for key.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getKeyBytes() {
       java.lang.Object ref = key_;
@@ -8245,6 +8006,7 @@ public java.lang.String getKey() {
      * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 2;
      * @return Whether the fromNode field is set.
      */
+    @java.lang.Override
     public boolean hasFromNode() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -8252,12 +8014,14 @@ public boolean hasFromNode() {
      * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 2;
      * @return The fromNode.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode() {
       return fromNode_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
     }
     /**
      * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder() {
       return fromNode_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
     }
@@ -8292,7 +8056,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getFromNode());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -8308,7 +8072,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getFromNode());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -8333,7 +8097,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getFromNode()
             .equals(other.getFromNode())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -8352,7 +8116,7 @@ public int hashCode() {
         hash = (37 * hash) + FROMNODE_FIELD_NUMBER;
         hash = (53 * hash) + getFromNode().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -8401,11 +8165,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Rea
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -8486,14 +8252,13 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         key_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (fromNodeBuilder_ == null) {
-          fromNode_ = null;
-        } else {
-          fromNodeBuilder_.clear();
+        fromNode_ = null;
+        if (fromNodeBuilder_ != null) {
+          fromNodeBuilder_.dispose();
+          fromNodeBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -8520,23 +8285,25 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read build
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.key_ = key_;
           to_bitField0_ |= 0x00000001;
         }
-        result.key_ = key_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (fromNodeBuilder_ == null) {
-            result.fromNode_ = fromNode_;
-          } else {
-            result.fromNode_ = fromNodeBuilder_.build();
-          }
+          result.fromNode_ = fromNodeBuilder_ == null
+              ? fromNode_
+              : fromNodeBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -8584,14 +8351,14 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read other) {
         if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read.getDefaultInstance()) return this;
         if (other.hasKey()) {
-          bitField0_ |= 0x00000001;
           key_ = other.key_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasFromNode()) {
           mergeFromNode(other.getFromNode());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -8614,17 +8381,42 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                key_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getFromNodeFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -8679,11 +8471,9 @@ public java.lang.String getKey() {
        */
       public Builder setKey(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         key_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8692,8 +8482,8 @@ public Builder setKey(
        * @return This builder for chaining.
        */
       public Builder clearKey() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         key_ = getDefaultInstance().getKey();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -8704,11 +8494,9 @@ public Builder clearKey() {
        */
       public Builder setKeyBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         key_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8743,11 +8531,11 @@ public Builder setFromNode(org.apache.pekko.cluster.ddata.protobuf.msg.Replicato
             throw new NullPointerException();
           }
           fromNode_ = value;
-          onChanged();
         } else {
           fromNodeBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -8757,11 +8545,11 @@ public Builder setFromNode(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
         if (fromNodeBuilder_ == null) {
           fromNode_ = builderForValue.build();
-          onChanged();
         } else {
           fromNodeBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -8770,31 +8558,32 @@ public Builder setFromNode(
       public Builder mergeFromNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
         if (fromNodeBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              fromNode_ != null &&
-              fromNode_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
-            fromNode_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(fromNode_).mergeFrom(value).buildPartial();
+            fromNode_ != null &&
+            fromNode_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
+            getFromNodeBuilder().mergeFrom(value);
           } else {
             fromNode_ = value;
           }
-          onChanged();
         } else {
           fromNodeBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (fromNode_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 2;
        */
       public Builder clearFromNode() {
-        if (fromNodeBuilder_ == null) {
-          fromNode_ = null;
-          onChanged();
-        } else {
-          fromNodeBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        fromNode_ = null;
+        if (fromNodeBuilder_ != null) {
+          fromNodeBuilder_.dispose();
+          fromNodeBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -8865,7 +8654,18 @@ public Read parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Read(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -8907,7 +8707,7 @@ public interface ReadResultOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.ReadResult}
    */
-  public  static final class ReadResult extends
+  public static final class ReadResult extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ReadResult)
       ReadResultOrBuilder {
@@ -8926,62 +8726,6 @@ protected java.lang.Object newInstance(
       return new ReadResult();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ReadResult(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = envelope_.toBuilder();
-              }
-              envelope_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(envelope_);
-                envelope_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_ReadResult_descriptor;
@@ -9002,6 +8746,7 @@ private ReadResult(
      * optional .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 1;
      * @return Whether the envelope field is set.
      */
+    @java.lang.Override
     public boolean hasEnvelope() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -9009,12 +8754,14 @@ public boolean hasEnvelope() {
      * optional .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 1;
      * @return The envelope.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope() {
       return envelope_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
     }
     /**
      * optional .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder() {
       return envelope_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
     }
@@ -9042,7 +8789,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getEnvelope());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -9055,7 +8802,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getEnvelope());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -9075,7 +8822,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getEnvelope()
             .equals(other.getEnvelope())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -9090,7 +8837,7 @@ public int hashCode() {
         hash = (37 * hash) + ENVELOPE_FIELD_NUMBER;
         hash = (53 * hash) + getEnvelope().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -9139,11 +8886,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Rea
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -9224,12 +8973,12 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (envelopeBuilder_ == null) {
-          envelope_ = null;
-        } else {
-          envelopeBuilder_.clear();
+        bitField0_ = 0;
+        envelope_ = null;
+        if (envelopeBuilder_ != null) {
+          envelopeBuilder_.dispose();
+          envelopeBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -9256,19 +9005,21 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (envelopeBuilder_ == null) {
-            result.envelope_ = envelope_;
-          } else {
-            result.envelope_ = envelopeBuilder_.build();
-          }
+          result.envelope_ = envelopeBuilder_ == null
+              ? envelope_
+              : envelopeBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -9318,7 +9069,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
         if (other.hasEnvelope()) {
           mergeEnvelope(other.getEnvelope());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -9338,17 +9089,37 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getEnvelopeFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -9383,11 +9154,11 @@ public Builder setEnvelope(org.apache.pekko.cluster.ddata.protobuf.msg.Replicato
             throw new NullPointerException();
           }
           envelope_ = value;
-          onChanged();
         } else {
           envelopeBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -9397,11 +9168,11 @@ public Builder setEnvelope(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder builderForValue) {
         if (envelopeBuilder_ == null) {
           envelope_ = builderForValue.build();
-          onChanged();
         } else {
           envelopeBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -9410,31 +9181,32 @@ public Builder setEnvelope(
       public Builder mergeEnvelope(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope value) {
         if (envelopeBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              envelope_ != null &&
-              envelope_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance()) {
-            envelope_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.newBuilder(envelope_).mergeFrom(value).buildPartial();
+            envelope_ != null &&
+            envelope_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance()) {
+            getEnvelopeBuilder().mergeFrom(value);
           } else {
             envelope_ = value;
           }
-          onChanged();
         } else {
           envelopeBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (envelope_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 1;
        */
       public Builder clearEnvelope() {
-        if (envelopeBuilder_ == null) {
-          envelope_ = null;
-          onChanged();
-        } else {
-          envelopeBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        envelope_ = null;
+        if (envelopeBuilder_ != null) {
+          envelopeBuilder_.dispose();
+          envelopeBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -9505,7 +9277,18 @@ public ReadResult parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ReadResult(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -9586,7 +9369,7 @@ org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Prun
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.DataEnvelope}
    */
-  public  static final class DataEnvelope extends
+  public static final class DataEnvelope extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.DataEnvelope)
       DataEnvelopeOrBuilder {
@@ -9606,87 +9389,6 @@ protected java.lang.Object newInstance(
       return new DataEnvelope();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private DataEnvelope(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = data_.toBuilder();
-              }
-              data_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(data_);
-                data_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                pruning_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              pruning_.add(
-                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.PARSER, extensionRegistry));
-              break;
-            }
-            case 26: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = deltaVersions_.toBuilder();
-              }
-              deltaVersions_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(deltaVersions_);
-                deltaVersions_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          pruning_ = java.util.Collections.unmodifiableList(pruning_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_DataEnvelope_descriptor;
@@ -9783,117 +9485,26 @@ org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder
     /**
      * Protobuf type {@code org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry}
      */
-    public  static final class PruningEntry extends
+    public static final class PruningEntry extends
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry)
         PruningEntryOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use PruningEntry.newBuilder() to construct.
-      private PruningEntry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
-        super(builder);
-      }
-      private PruningEntry() {
-        seen_ = java.util.Collections.emptyList();
-      }
-
-      @java.lang.Override
-      @SuppressWarnings({"unused"})
-      protected java.lang.Object newInstance(
-          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
-        return new PruningEntry();
-      }
-
-      @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private PruningEntry(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10: {
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000001) != 0)) {
-                  subBuilder = removedAddress_.toBuilder();
-                }
-                removedAddress_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(removedAddress_);
-                  removedAddress_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000001;
-                break;
-              }
-              case 18: {
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000002) != 0)) {
-                  subBuilder = ownerAddress_.toBuilder();
-                }
-                ownerAddress_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(ownerAddress_);
-                  ownerAddress_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000002;
-                break;
-              }
-              case 24: {
-                bitField0_ |= 0x00000004;
-                performed_ = input.readBool();
-                break;
-              }
-              case 34: {
-                if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                  seen_ = new java.util.ArrayList();
-                  mutable_bitField0_ |= 0x00000008;
-                }
-                seen_.add(
-                    input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.PARSER, extensionRegistry));
-                break;
-              }
-              case 40: {
-                bitField0_ |= 0x00000008;
-                obsoleteTime_ = input.readSInt64();
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          if (((mutable_bitField0_ & 0x00000008) != 0)) {
-            seen_ = java.util.Collections.unmodifiableList(seen_);
-          }
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
+      private PruningEntry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+        super(builder);
+      }
+      private PruningEntry() {
+        seen_ = java.util.Collections.emptyList();
+      }
+
+      @java.lang.Override
+      @SuppressWarnings({"unused"})
+      protected java.lang.Object newInstance(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        return new PruningEntry();
       }
+
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_DataEnvelope_PruningEntry_descriptor;
@@ -9914,6 +9525,7 @@ private PruningEntry(
        * required .org.apache.pekko.cluster.ddata.UniqueAddress removedAddress = 1;
        * @return Whether the removedAddress field is set.
        */
+      @java.lang.Override
       public boolean hasRemovedAddress() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -9921,12 +9533,14 @@ public boolean hasRemovedAddress() {
        * required .org.apache.pekko.cluster.ddata.UniqueAddress removedAddress = 1;
        * @return The removedAddress.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getRemovedAddress() {
         return removedAddress_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : removedAddress_;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.UniqueAddress removedAddress = 1;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getRemovedAddressOrBuilder() {
         return removedAddress_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : removedAddress_;
       }
@@ -9937,6 +9551,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddr
        * required .org.apache.pekko.cluster.ddata.UniqueAddress ownerAddress = 2;
        * @return Whether the ownerAddress field is set.
        */
+      @java.lang.Override
       public boolean hasOwnerAddress() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -9944,22 +9559,25 @@ public boolean hasOwnerAddress() {
        * required .org.apache.pekko.cluster.ddata.UniqueAddress ownerAddress = 2;
        * @return The ownerAddress.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getOwnerAddress() {
         return ownerAddress_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : ownerAddress_;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.UniqueAddress ownerAddress = 2;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getOwnerAddressOrBuilder() {
         return ownerAddress_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : ownerAddress_;
       }
 
       public static final int PERFORMED_FIELD_NUMBER = 3;
-      private boolean performed_;
+      private boolean performed_ = false;
       /**
        * required bool performed = 3;
        * @return Whether the performed field is set.
        */
+      @java.lang.Override
       public boolean hasPerformed() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -9967,21 +9585,25 @@ public boolean hasPerformed() {
        * required bool performed = 3;
        * @return The performed.
        */
+      @java.lang.Override
       public boolean getPerformed() {
         return performed_;
       }
 
       public static final int SEEN_FIELD_NUMBER = 4;
+      @SuppressWarnings("serial")
       private java.util.List seen_;
       /**
        * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
        */
+      @java.lang.Override
       public java.util.List getSeenList() {
         return seen_;
       }
       /**
        * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
        */
+      @java.lang.Override
       public java.util.List 
           getSeenOrBuilderList() {
         return seen_;
@@ -9989,29 +9611,33 @@ public java.util.Listrepeated .org.apache.pekko.cluster.ddata.Address seen = 4;
        */
+      @java.lang.Override
       public int getSeenCount() {
         return seen_.size();
       }
       /**
        * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address getSeen(int index) {
         return seen_.get(index);
       }
       /**
        * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder getSeenOrBuilder(
           int index) {
         return seen_.get(index);
       }
 
       public static final int OBSOLETETIME_FIELD_NUMBER = 5;
-      private long obsoleteTime_;
+      private long obsoleteTime_ = 0L;
       /**
        * optional sint64 obsoleteTime = 5;
        * @return Whether the obsoleteTime field is set.
        */
+      @java.lang.Override
       public boolean hasObsoleteTime() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -10019,6 +9645,7 @@ public boolean hasObsoleteTime() {
        * optional sint64 obsoleteTime = 5;
        * @return The obsoleteTime.
        */
+      @java.lang.Override
       public long getObsoleteTime() {
         return obsoleteTime_;
       }
@@ -10078,7 +9705,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         if (((bitField0_ & 0x00000008) != 0)) {
           output.writeSInt64(5, obsoleteTime_);
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -10107,7 +9734,7 @@ public int getSerializedSize() {
           size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeSInt64Size(5, obsoleteTime_);
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -10144,7 +9771,7 @@ public boolean equals(final java.lang.Object obj) {
           if (getObsoleteTime()
               != other.getObsoleteTime()) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -10177,7 +9804,7 @@ public int hashCode() {
           hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               getObsoleteTime());
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -10226,11 +9853,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Dat
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseDelimitedFrom(
           java.io.InputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -10313,28 +9942,26 @@ private void maybeForceBuilderInitialization() {
         @java.lang.Override
         public Builder clear() {
           super.clear();
-          if (removedAddressBuilder_ == null) {
-            removedAddress_ = null;
-          } else {
-            removedAddressBuilder_.clear();
+          bitField0_ = 0;
+          removedAddress_ = null;
+          if (removedAddressBuilder_ != null) {
+            removedAddressBuilder_.dispose();
+            removedAddressBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000001);
-          if (ownerAddressBuilder_ == null) {
-            ownerAddress_ = null;
-          } else {
-            ownerAddressBuilder_.clear();
+          ownerAddress_ = null;
+          if (ownerAddressBuilder_ != null) {
+            ownerAddressBuilder_.dispose();
+            ownerAddressBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000002);
           performed_ = false;
-          bitField0_ = (bitField0_ & ~0x00000004);
           if (seenBuilder_ == null) {
             seen_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000008);
           } else {
+            seen_ = null;
             seenBuilder_.clear();
           }
+          bitField0_ = (bitField0_ & ~0x00000008);
           obsoleteTime_ = 0L;
-          bitField0_ = (bitField0_ & ~0x00000010);
           return this;
         }
 
@@ -10361,44 +9988,48 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelo
         @java.lang.Override
         public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry buildPartial() {
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry(this);
+          buildPartialRepeatedFields(result);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartialRepeatedFields(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry result) {
+          if (seenBuilder_ == null) {
+            if (((bitField0_ & 0x00000008) != 0)) {
+              seen_ = java.util.Collections.unmodifiableList(seen_);
+              bitField0_ = (bitField0_ & ~0x00000008);
+            }
+            result.seen_ = seen_;
+          } else {
+            result.seen_ = seenBuilder_.build();
+          }
+        }
+
+        private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
-            if (removedAddressBuilder_ == null) {
-              result.removedAddress_ = removedAddress_;
-            } else {
-              result.removedAddress_ = removedAddressBuilder_.build();
-            }
+            result.removedAddress_ = removedAddressBuilder_ == null
+                ? removedAddress_
+                : removedAddressBuilder_.build();
             to_bitField0_ |= 0x00000001;
           }
           if (((from_bitField0_ & 0x00000002) != 0)) {
-            if (ownerAddressBuilder_ == null) {
-              result.ownerAddress_ = ownerAddress_;
-            } else {
-              result.ownerAddress_ = ownerAddressBuilder_.build();
-            }
+            result.ownerAddress_ = ownerAddressBuilder_ == null
+                ? ownerAddress_
+                : ownerAddressBuilder_.build();
             to_bitField0_ |= 0x00000002;
           }
           if (((from_bitField0_ & 0x00000004) != 0)) {
             result.performed_ = performed_;
             to_bitField0_ |= 0x00000004;
           }
-          if (seenBuilder_ == null) {
-            if (((bitField0_ & 0x00000008) != 0)) {
-              seen_ = java.util.Collections.unmodifiableList(seen_);
-              bitField0_ = (bitField0_ & ~0x00000008);
-            }
-            result.seen_ = seen_;
-          } else {
-            result.seen_ = seenBuilder_.build();
-          }
           if (((from_bitField0_ & 0x00000010) != 0)) {
             result.obsoleteTime_ = obsoleteTime_;
             to_bitField0_ |= 0x00000008;
           }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -10483,7 +10114,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
           if (other.hasObsoleteTime()) {
             setObsoleteTime(other.getObsoleteTime());
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -10518,17 +10149,67 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 10: {
+                  input.readMessage(
+                      getRemovedAddressFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+                case 18: {
+                  input.readMessage(
+                      getOwnerAddressFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                case 24: {
+                  performed_ = input.readBool();
+                  bitField0_ |= 0x00000004;
+                  break;
+                } // case 24
+                case 34: {
+                  org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address m =
+                      input.readMessage(
+                          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.PARSER,
+                          extensionRegistry);
+                  if (seenBuilder_ == null) {
+                    ensureSeenIsMutable();
+                    seen_.add(m);
+                  } else {
+                    seenBuilder_.addMessage(m);
+                  }
+                  break;
+                } // case 34
+                case 40: {
+                  obsoleteTime_ = input.readSInt64();
+                  bitField0_ |= 0x00000010;
+                  break;
+                } // case 40
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
         private int bitField0_;
@@ -10563,11 +10244,11 @@ public Builder setRemovedAddress(org.apache.pekko.cluster.ddata.protobuf.msg.Rep
               throw new NullPointerException();
             }
             removedAddress_ = value;
-            onChanged();
           } else {
             removedAddressBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000001;
+          onChanged();
           return this;
         }
         /**
@@ -10577,11 +10258,11 @@ public Builder setRemovedAddress(
             org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
           if (removedAddressBuilder_ == null) {
             removedAddress_ = builderForValue.build();
-            onChanged();
           } else {
             removedAddressBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000001;
+          onChanged();
           return this;
         }
         /**
@@ -10590,31 +10271,32 @@ public Builder setRemovedAddress(
         public Builder mergeRemovedAddress(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
           if (removedAddressBuilder_ == null) {
             if (((bitField0_ & 0x00000001) != 0) &&
-                removedAddress_ != null &&
-                removedAddress_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
-              removedAddress_ =
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(removedAddress_).mergeFrom(value).buildPartial();
+              removedAddress_ != null &&
+              removedAddress_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
+              getRemovedAddressBuilder().mergeFrom(value);
             } else {
               removedAddress_ = value;
             }
-            onChanged();
           } else {
             removedAddressBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000001;
+          if (removedAddress_ != null) {
+            bitField0_ |= 0x00000001;
+            onChanged();
+          }
           return this;
         }
         /**
          * required .org.apache.pekko.cluster.ddata.UniqueAddress removedAddress = 1;
          */
         public Builder clearRemovedAddress() {
-          if (removedAddressBuilder_ == null) {
-            removedAddress_ = null;
-            onChanged();
-          } else {
-            removedAddressBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000001);
+          removedAddress_ = null;
+          if (removedAddressBuilder_ != null) {
+            removedAddressBuilder_.dispose();
+            removedAddressBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -10683,11 +10365,11 @@ public Builder setOwnerAddress(org.apache.pekko.cluster.ddata.protobuf.msg.Repli
               throw new NullPointerException();
             }
             ownerAddress_ = value;
-            onChanged();
           } else {
             ownerAddressBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /**
@@ -10697,11 +10379,11 @@ public Builder setOwnerAddress(
             org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
           if (ownerAddressBuilder_ == null) {
             ownerAddress_ = builderForValue.build();
-            onChanged();
           } else {
             ownerAddressBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /**
@@ -10710,31 +10392,32 @@ public Builder setOwnerAddress(
         public Builder mergeOwnerAddress(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
           if (ownerAddressBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
-                ownerAddress_ != null &&
-                ownerAddress_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
-              ownerAddress_ =
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(ownerAddress_).mergeFrom(value).buildPartial();
+              ownerAddress_ != null &&
+              ownerAddress_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
+              getOwnerAddressBuilder().mergeFrom(value);
             } else {
               ownerAddress_ = value;
             }
-            onChanged();
           } else {
             ownerAddressBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000002;
+          if (ownerAddress_ != null) {
+            bitField0_ |= 0x00000002;
+            onChanged();
+          }
           return this;
         }
         /**
          * required .org.apache.pekko.cluster.ddata.UniqueAddress ownerAddress = 2;
          */
         public Builder clearOwnerAddress() {
-          if (ownerAddressBuilder_ == null) {
-            ownerAddress_ = null;
-            onChanged();
-          } else {
-            ownerAddressBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000002);
+          ownerAddress_ = null;
+          if (ownerAddressBuilder_ != null) {
+            ownerAddressBuilder_.dispose();
+            ownerAddressBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -10778,6 +10461,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddr
          * required bool performed = 3;
          * @return Whether the performed field is set.
          */
+        @java.lang.Override
         public boolean hasPerformed() {
           return ((bitField0_ & 0x00000004) != 0);
         }
@@ -10785,6 +10469,7 @@ public boolean hasPerformed() {
          * required bool performed = 3;
          * @return The performed.
          */
+        @java.lang.Override
         public boolean getPerformed() {
           return performed_;
         }
@@ -10794,8 +10479,9 @@ public boolean getPerformed() {
          * @return This builder for chaining.
          */
         public Builder setPerformed(boolean value) {
-          bitField0_ |= 0x00000004;
+
           performed_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -11055,6 +10741,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Bu
          * optional sint64 obsoleteTime = 5;
          * @return Whether the obsoleteTime field is set.
          */
+        @java.lang.Override
         public boolean hasObsoleteTime() {
           return ((bitField0_ & 0x00000010) != 0);
         }
@@ -11062,6 +10749,7 @@ public boolean hasObsoleteTime() {
          * optional sint64 obsoleteTime = 5;
          * @return The obsoleteTime.
          */
+        @java.lang.Override
         public long getObsoleteTime() {
           return obsoleteTime_;
         }
@@ -11071,8 +10759,9 @@ public long getObsoleteTime() {
          * @return This builder for chaining.
          */
         public Builder setObsoleteTime(long value) {
-          bitField0_ |= 0x00000010;
+
           obsoleteTime_ = value;
+          bitField0_ |= 0x00000010;
           onChanged();
           return this;
         }
@@ -11119,7 +10808,18 @@ public PruningEntry parsePartialFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-          return new PruningEntry(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
@@ -11146,6 +10846,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelo
      * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
      * @return Whether the data field is set.
      */
+    @java.lang.Override
     public boolean hasData() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -11153,27 +10854,32 @@ public boolean hasData() {
      * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
      * @return The data.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData() {
       return data_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder() {
       return data_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
     }
 
     public static final int PRUNING_FIELD_NUMBER = 2;
+    @SuppressWarnings("serial")
     private java.util.List pruning_;
     /**
      * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
+    @java.lang.Override
     public java.util.List getPruningList() {
       return pruning_;
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
+    @java.lang.Override
     public java.util.List 
         getPruningOrBuilderList() {
       return pruning_;
@@ -11181,18 +10887,21 @@ public java.util.Listrepeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
+    @java.lang.Override
     public int getPruningCount() {
       return pruning_.size();
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry getPruning(int index) {
       return pruning_.get(index);
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder getPruningOrBuilder(
         int index) {
       return pruning_.get(index);
@@ -11204,6 +10913,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelo
      * optional .org.apache.pekko.cluster.ddata.VersionVector deltaVersions = 3;
      * @return Whether the deltaVersions field is set.
      */
+    @java.lang.Override
     public boolean hasDeltaVersions() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -11211,12 +10921,14 @@ public boolean hasDeltaVersions() {
      * optional .org.apache.pekko.cluster.ddata.VersionVector deltaVersions = 3;
      * @return The deltaVersions.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getDeltaVersions() {
       return deltaVersions_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance() : deltaVersions_;
     }
     /**
      * optional .org.apache.pekko.cluster.ddata.VersionVector deltaVersions = 3;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getDeltaVersionsOrBuilder() {
       return deltaVersions_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance() : deltaVersions_;
     }
@@ -11264,7 +10976,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(3, getDeltaVersions());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -11285,7 +10997,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, getDeltaVersions());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -11312,7 +11024,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getDeltaVersions()
             .equals(other.getDeltaVersions())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -11335,7 +11047,7 @@ public int hashCode() {
         hash = (37 * hash) + DELTAVERSIONS_FIELD_NUMBER;
         hash = (53 * hash) + getDeltaVersions().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -11384,11 +11096,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Dat
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -11471,24 +11185,24 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (dataBuilder_ == null) {
-          data_ = null;
-        } else {
-          dataBuilder_.clear();
+        bitField0_ = 0;
+        data_ = null;
+        if (dataBuilder_ != null) {
+          dataBuilder_.dispose();
+          dataBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         if (pruningBuilder_ == null) {
           pruning_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
+          pruning_ = null;
           pruningBuilder_.clear();
         }
-        if (deltaVersionsBuilder_ == null) {
-          deltaVersions_ = null;
-        } else {
-          deltaVersionsBuilder_.clear();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        deltaVersions_ = null;
+        if (deltaVersionsBuilder_ != null) {
+          deltaVersionsBuilder_.dispose();
+          deltaVersionsBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -11515,16 +11229,13 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelo
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (dataBuilder_ == null) {
-            result.data_ = data_;
-          } else {
-            result.data_ = dataBuilder_.build();
-          }
-          to_bitField0_ |= 0x00000001;
-        }
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope result) {
         if (pruningBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
             pruning_ = java.util.Collections.unmodifiableList(pruning_);
@@ -11534,17 +11245,24 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelo
         } else {
           result.pruning_ = pruningBuilder_.build();
         }
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.data_ = dataBuilder_ == null
+              ? data_
+              : dataBuilder_.build();
+          to_bitField0_ |= 0x00000001;
+        }
         if (((from_bitField0_ & 0x00000004) != 0)) {
-          if (deltaVersionsBuilder_ == null) {
-            result.deltaVersions_ = deltaVersions_;
-          } else {
-            result.deltaVersions_ = deltaVersionsBuilder_.build();
-          }
+          result.deltaVersions_ = deltaVersionsBuilder_ == null
+              ? deltaVersions_
+              : deltaVersionsBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -11623,7 +11341,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
         if (other.hasDeltaVersions()) {
           mergeDeltaVersions(other.getDeltaVersions());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -11654,17 +11372,57 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getDataFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.PARSER,
+                        extensionRegistry);
+                if (pruningBuilder_ == null) {
+                  ensurePruningIsMutable();
+                  pruning_.add(m);
+                } else {
+                  pruningBuilder_.addMessage(m);
+                }
+                break;
+              } // case 18
+              case 26: {
+                input.readMessage(
+                    getDeltaVersionsFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -11699,11 +11457,11 @@ public Builder setData(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMes
             throw new NullPointerException();
           }
           data_ = value;
-          onChanged();
         } else {
           dataBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -11713,11 +11471,11 @@ public Builder setData(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (dataBuilder_ == null) {
           data_ = builderForValue.build();
-          onChanged();
         } else {
           dataBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -11726,31 +11484,32 @@ public Builder setData(
       public Builder mergeData(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (dataBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              data_ != null &&
-              data_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-            data_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(data_).mergeFrom(value).buildPartial();
+            data_ != null &&
+            data_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+            getDataBuilder().mergeFrom(value);
           } else {
             data_ = value;
           }
-          onChanged();
         } else {
           dataBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (data_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
        */
       public Builder clearData() {
-        if (dataBuilder_ == null) {
-          data_ = null;
-          onChanged();
-        } else {
-          dataBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        data_ = null;
+        if (dataBuilder_ != null) {
+          dataBuilder_.dispose();
+          dataBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -12059,11 +11818,11 @@ public Builder setDeltaVersions(org.apache.pekko.cluster.ddata.protobuf.msg.Repl
             throw new NullPointerException();
           }
           deltaVersions_ = value;
-          onChanged();
         } else {
           deltaVersionsBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -12073,11 +11832,11 @@ public Builder setDeltaVersions(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder builderForValue) {
         if (deltaVersionsBuilder_ == null) {
           deltaVersions_ = builderForValue.build();
-          onChanged();
         } else {
           deltaVersionsBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -12086,31 +11845,32 @@ public Builder setDeltaVersions(
       public Builder mergeDeltaVersions(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector value) {
         if (deltaVersionsBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
-              deltaVersions_ != null &&
-              deltaVersions_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance()) {
-            deltaVersions_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.newBuilder(deltaVersions_).mergeFrom(value).buildPartial();
+            deltaVersions_ != null &&
+            deltaVersions_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance()) {
+            getDeltaVersionsBuilder().mergeFrom(value);
           } else {
             deltaVersions_ = value;
           }
-          onChanged();
         } else {
           deltaVersionsBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000004;
+        if (deltaVersions_ != null) {
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .org.apache.pekko.cluster.ddata.VersionVector deltaVersions = 3;
        */
       public Builder clearDeltaVersions() {
-        if (deltaVersionsBuilder_ == null) {
-          deltaVersions_ = null;
-          onChanged();
-        } else {
-          deltaVersionsBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000004);
+        deltaVersions_ = null;
+        if (deltaVersionsBuilder_ != null) {
+          deltaVersionsBuilder_.dispose();
+          deltaVersionsBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -12181,7 +11941,18 @@ public DataEnvelope parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new DataEnvelope(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -12276,7 +12047,7 @@ org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.EntryOrBui
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.Status}
    */
-  public  static final class Status extends
+  public static final class Status extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Status)
       StatusOrBuilder {
@@ -12295,82 +12066,7 @@ protected java.lang.Object newInstance(
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Status();
     }
-
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Status(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              chunk_ = input.readUInt32();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              totChunks_ = input.readUInt32();
-              break;
-            }
-            case 26: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                entries_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              entries_.add(
-                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.PARSER, extensionRegistry));
-              break;
-            }
-            case 33: {
-              bitField0_ |= 0x00000004;
-              toSystemUid_ = input.readSFixed64();
-              break;
-            }
-            case 41: {
-              bitField0_ |= 0x00000008;
-              fromSystemUid_ = input.readSFixed64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          entries_ = java.util.Collections.unmodifiableList(entries_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
+
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_Status_descriptor;
@@ -12419,7 +12115,7 @@ public interface EntryOrBuilder extends
     /**
      * Protobuf type {@code org.apache.pekko.cluster.ddata.Status.Entry}
      */
-    public  static final class Entry extends
+    public static final class Entry extends
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Status.Entry)
         EntryOrBuilder {
@@ -12440,60 +12136,6 @@ protected java.lang.Object newInstance(
         return new Entry();
       }
 
-      @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private Entry(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10: {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000001;
-                key_ = bs;
-                break;
-              }
-              case 18: {
-                bitField0_ |= 0x00000002;
-                digest_ = input.readBytes();
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_Status_Entry_descriptor;
@@ -12509,11 +12151,13 @@ private Entry(
 
       private int bitField0_;
       public static final int KEY_FIELD_NUMBER = 1;
-      private volatile java.lang.Object key_;
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object key_ = "";
       /**
        * required string key = 1;
        * @return Whether the key field is set.
        */
+      @java.lang.Override
       public boolean hasKey() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -12521,6 +12165,7 @@ public boolean hasKey() {
        * required string key = 1;
        * @return The key.
        */
+      @java.lang.Override
       public java.lang.String getKey() {
         java.lang.Object ref = key_;
         if (ref instanceof java.lang.String) {
@@ -12539,6 +12184,7 @@ public java.lang.String getKey() {
        * required string key = 1;
        * @return The bytes for key.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString
           getKeyBytes() {
         java.lang.Object ref = key_;
@@ -12554,11 +12200,12 @@ public java.lang.String getKey() {
       }
 
       public static final int DIGEST_FIELD_NUMBER = 2;
-      private org.apache.pekko.protobufv3.internal.ByteString digest_;
+      private org.apache.pekko.protobufv3.internal.ByteString digest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       /**
        * required bytes digest = 2;
        * @return Whether the digest field is set.
        */
+      @java.lang.Override
       public boolean hasDigest() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -12566,6 +12213,7 @@ public boolean hasDigest() {
        * required bytes digest = 2;
        * @return The digest.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getDigest() {
         return digest_;
       }
@@ -12598,7 +12246,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeBytes(2, digest_);
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -12614,7 +12262,7 @@ public int getSerializedSize() {
           size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeBytesSize(2, digest_);
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -12639,7 +12287,7 @@ public boolean equals(final java.lang.Object obj) {
           if (!getDigest()
               .equals(other.getDigest())) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -12658,7 +12306,7 @@ public int hashCode() {
           hash = (37 * hash) + DIGEST_FIELD_NUMBER;
           hash = (53 * hash) + getDigest().hashCode();
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -12707,11 +12355,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Sta
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseDelimitedFrom(
           java.io.InputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -12775,26 +12425,20 @@ public static final class Builder extends
 
         // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.newBuilder()
         private Builder() {
-          maybeForceBuilderInitialization();
+
         }
 
         private Builder(
             org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
-          maybeForceBuilderInitialization();
-        }
-        private void maybeForceBuilderInitialization() {
-          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                  .alwaysUseFieldBuilders) {
-          }
+
         }
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           key_ = "";
-          bitField0_ = (bitField0_ & ~0x00000001);
           digest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-          bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
@@ -12821,19 +12465,23 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Ent
         @java.lang.Override
         public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry buildPartial() {
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.key_ = key_;
             to_bitField0_ |= 0x00000001;
           }
-          result.key_ = key_;
           if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.digest_ = digest_;
             to_bitField0_ |= 0x00000002;
           }
-          result.digest_ = digest_;
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -12881,14 +12529,14 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
         public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry other) {
           if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.getDefaultInstance()) return this;
           if (other.hasKey()) {
-            bitField0_ |= 0x00000001;
             key_ = other.key_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (other.hasDigest()) {
             setDigest(other.getDigest());
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -12909,17 +12557,40 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 10: {
+                  key_ = input.readBytes();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+                case 18: {
+                  digest_ = input.readBytes();
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
         private int bitField0_;
@@ -12974,11 +12645,9 @@ public java.lang.String getKey() {
          */
         public Builder setKey(
             java.lang.String value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+          if (value == null) { throw new NullPointerException(); }
           key_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -12987,8 +12656,8 @@ public Builder setKey(
          * @return This builder for chaining.
          */
         public Builder clearKey() {
-          bitField0_ = (bitField0_ & ~0x00000001);
           key_ = getDefaultInstance().getKey();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -12999,11 +12668,9 @@ public Builder clearKey() {
          */
         public Builder setKeyBytes(
             org.apache.pekko.protobufv3.internal.ByteString value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+          if (value == null) { throw new NullPointerException(); }
           key_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -13013,6 +12680,7 @@ public Builder setKeyBytes(
          * required bytes digest = 2;
          * @return Whether the digest field is set.
          */
+        @java.lang.Override
         public boolean hasDigest() {
           return ((bitField0_ & 0x00000002) != 0);
         }
@@ -13020,6 +12688,7 @@ public boolean hasDigest() {
          * required bytes digest = 2;
          * @return The digest.
          */
+        @java.lang.Override
         public org.apache.pekko.protobufv3.internal.ByteString getDigest() {
           return digest_;
         }
@@ -13029,11 +12698,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getDigest() {
          * @return This builder for chaining.
          */
         public Builder setDigest(org.apache.pekko.protobufv3.internal.ByteString value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+          if (value == null) { throw new NullPointerException(); }
           digest_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -13080,7 +12747,18 @@ public Entry parsePartialFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-          return new Entry(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
@@ -13102,11 +12780,12 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Ent
 
     private int bitField0_;
     public static final int CHUNK_FIELD_NUMBER = 1;
-    private int chunk_;
+    private int chunk_ = 0;
     /**
      * required uint32 chunk = 1;
      * @return Whether the chunk field is set.
      */
+    @java.lang.Override
     public boolean hasChunk() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -13114,16 +12793,18 @@ public boolean hasChunk() {
      * required uint32 chunk = 1;
      * @return The chunk.
      */
+    @java.lang.Override
     public int getChunk() {
       return chunk_;
     }
 
     public static final int TOTCHUNKS_FIELD_NUMBER = 2;
-    private int totChunks_;
+    private int totChunks_ = 0;
     /**
      * required uint32 totChunks = 2;
      * @return Whether the totChunks field is set.
      */
+    @java.lang.Override
     public boolean hasTotChunks() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -13131,21 +12812,25 @@ public boolean hasTotChunks() {
      * required uint32 totChunks = 2;
      * @return The totChunks.
      */
+    @java.lang.Override
     public int getTotChunks() {
       return totChunks_;
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 3;
+    @SuppressWarnings("serial")
     private java.util.List entries_;
     /**
      * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
      */
+    @java.lang.Override
     public java.util.List getEntriesList() {
       return entries_;
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
      */
+    @java.lang.Override
     public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
@@ -13153,29 +12838,33 @@ public java.util.Listrepeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
      */
+    @java.lang.Override
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
     }
 
     public static final int TOSYSTEMUID_FIELD_NUMBER = 4;
-    private long toSystemUid_;
+    private long toSystemUid_ = 0L;
     /**
      * optional sfixed64 toSystemUid = 4;
      * @return Whether the toSystemUid field is set.
      */
+    @java.lang.Override
     public boolean hasToSystemUid() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -13183,16 +12872,18 @@ public boolean hasToSystemUid() {
      * optional sfixed64 toSystemUid = 4;
      * @return The toSystemUid.
      */
+    @java.lang.Override
     public long getToSystemUid() {
       return toSystemUid_;
     }
 
     public static final int FROMSYSTEMUID_FIELD_NUMBER = 5;
-    private long fromSystemUid_;
+    private long fromSystemUid_ = 0L;
     /**
      * optional sfixed64 fromSystemUid = 5;
      * @return Whether the fromSystemUid field is set.
      */
+    @java.lang.Override
     public boolean hasFromSystemUid() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -13200,6 +12891,7 @@ public boolean hasFromSystemUid() {
      * optional sfixed64 fromSystemUid = 5;
      * @return The fromSystemUid.
      */
+    @java.lang.Override
     public long getFromSystemUid() {
       return fromSystemUid_;
     }
@@ -13247,7 +12939,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeSFixed64(5, fromSystemUid_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -13276,7 +12968,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeSFixed64Size(5, fromSystemUid_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -13313,7 +13005,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getFromSystemUid()
             != other.getFromSystemUid()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -13346,7 +13038,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getFromSystemUid());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -13395,11 +13087,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Sta
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -13463,37 +13157,29 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getEntriesFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         chunk_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000001);
         totChunks_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         if (entriesBuilder_ == null) {
           entries_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
         } else {
+          entries_ = null;
           entriesBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000004);
         toSystemUid_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000008);
         fromSystemUid_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
@@ -13520,6 +13206,25 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status bui
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status(this);
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status result) {
+        if (entriesBuilder_ == null) {
+          if (((bitField0_ & 0x00000004) != 0)) {
+            entries_ = java.util.Collections.unmodifiableList(entries_);
+            bitField0_ = (bitField0_ & ~0x00000004);
+          }
+          result.entries_ = entries_;
+        } else {
+          result.entries_ = entriesBuilder_.build();
+        }
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -13530,15 +13235,6 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status bui
           result.totChunks_ = totChunks_;
           to_bitField0_ |= 0x00000002;
         }
-        if (entriesBuilder_ == null) {
-          if (((bitField0_ & 0x00000004) != 0)) {
-            entries_ = java.util.Collections.unmodifiableList(entries_);
-            bitField0_ = (bitField0_ & ~0x00000004);
-          }
-          result.entries_ = entries_;
-        } else {
-          result.entries_ = entriesBuilder_.build();
-        }
         if (((from_bitField0_ & 0x00000008) != 0)) {
           result.toSystemUid_ = toSystemUid_;
           to_bitField0_ |= 0x00000004;
@@ -13547,9 +13243,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status bui
           result.fromSystemUid_ = fromSystemUid_;
           to_bitField0_ |= 0x00000008;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -13634,7 +13328,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
         if (other.hasFromSystemUid()) {
           setFromSystemUid(other.getFromSystemUid());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -13660,17 +13354,63 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                chunk_ = input.readUInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 16: {
+                totChunks_ = input.readUInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 26: {
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.PARSER,
+                        extensionRegistry);
+                if (entriesBuilder_ == null) {
+                  ensureEntriesIsMutable();
+                  entries_.add(m);
+                } else {
+                  entriesBuilder_.addMessage(m);
+                }
+                break;
+              } // case 26
+              case 33: {
+                toSystemUid_ = input.readSFixed64();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 33
+              case 41: {
+                fromSystemUid_ = input.readSFixed64();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 41
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -13680,6 +13420,7 @@ public Builder mergeFrom(
        * required uint32 chunk = 1;
        * @return Whether the chunk field is set.
        */
+      @java.lang.Override
       public boolean hasChunk() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -13687,6 +13428,7 @@ public boolean hasChunk() {
        * required uint32 chunk = 1;
        * @return The chunk.
        */
+      @java.lang.Override
       public int getChunk() {
         return chunk_;
       }
@@ -13696,8 +13438,9 @@ public int getChunk() {
        * @return This builder for chaining.
        */
       public Builder setChunk(int value) {
-        bitField0_ |= 0x00000001;
+
         chunk_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -13717,6 +13460,7 @@ public Builder clearChunk() {
        * required uint32 totChunks = 2;
        * @return Whether the totChunks field is set.
        */
+      @java.lang.Override
       public boolean hasTotChunks() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -13724,6 +13468,7 @@ public boolean hasTotChunks() {
        * required uint32 totChunks = 2;
        * @return The totChunks.
        */
+      @java.lang.Override
       public int getTotChunks() {
         return totChunks_;
       }
@@ -13733,8 +13478,9 @@ public int getTotChunks() {
        * @return This builder for chaining.
        */
       public Builder setTotChunks(int value) {
-        bitField0_ |= 0x00000002;
+
         totChunks_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -13994,6 +13740,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Ent
        * optional sfixed64 toSystemUid = 4;
        * @return Whether the toSystemUid field is set.
        */
+      @java.lang.Override
       public boolean hasToSystemUid() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -14001,6 +13748,7 @@ public boolean hasToSystemUid() {
        * optional sfixed64 toSystemUid = 4;
        * @return The toSystemUid.
        */
+      @java.lang.Override
       public long getToSystemUid() {
         return toSystemUid_;
       }
@@ -14010,8 +13758,9 @@ public long getToSystemUid() {
        * @return This builder for chaining.
        */
       public Builder setToSystemUid(long value) {
-        bitField0_ |= 0x00000008;
+
         toSystemUid_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -14031,6 +13780,7 @@ public Builder clearToSystemUid() {
        * optional sfixed64 fromSystemUid = 5;
        * @return Whether the fromSystemUid field is set.
        */
+      @java.lang.Override
       public boolean hasFromSystemUid() {
         return ((bitField0_ & 0x00000010) != 0);
       }
@@ -14038,6 +13788,7 @@ public boolean hasFromSystemUid() {
        * optional sfixed64 fromSystemUid = 5;
        * @return The fromSystemUid.
        */
+      @java.lang.Override
       public long getFromSystemUid() {
         return fromSystemUid_;
       }
@@ -14047,8 +13798,9 @@ public long getFromSystemUid() {
        * @return This builder for chaining.
        */
       public Builder setFromSystemUid(long value) {
-        bitField0_ |= 0x00000010;
+
         fromSystemUid_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -14095,7 +13847,18 @@ public Status parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Status(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -14179,7 +13942,7 @@ org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.EntryOrBui
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.Gossip}
    */
-  public  static final class Gossip extends
+  public static final class Gossip extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Gossip)
       GossipOrBuilder {
@@ -14199,76 +13962,6 @@ protected java.lang.Object newInstance(
       return new Gossip();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Gossip(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              sendBack_ = input.readBool();
-              break;
-            }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                entries_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              entries_.add(
-                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.PARSER, extensionRegistry));
-              break;
-            }
-            case 25: {
-              bitField0_ |= 0x00000002;
-              toSystemUid_ = input.readSFixed64();
-              break;
-            }
-            case 33: {
-              bitField0_ |= 0x00000004;
-              fromSystemUid_ = input.readSFixed64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          entries_ = java.util.Collections.unmodifiableList(entries_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_Gossip_descriptor;
@@ -14321,7 +14014,7 @@ public interface EntryOrBuilder extends
     /**
      * Protobuf type {@code org.apache.pekko.cluster.ddata.Gossip.Entry}
      */
-    public  static final class Entry extends
+    public static final class Entry extends
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Gossip.Entry)
         EntryOrBuilder {
@@ -14336,73 +14029,11 @@ private Entry() {
 
       @java.lang.Override
       @SuppressWarnings({"unused"})
-      protected java.lang.Object newInstance(
-          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
-        return new Entry();
-      }
-
-      @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private Entry(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10: {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000001;
-                key_ = bs;
-                break;
-              }
-              case 18: {
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000002) != 0)) {
-                  subBuilder = envelope_.toBuilder();
-                }
-                envelope_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(envelope_);
-                  envelope_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000002;
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
+      protected java.lang.Object newInstance(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        return new Entry();
       }
+
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_Gossip_Entry_descriptor;
@@ -14418,11 +14049,13 @@ private Entry(
 
       private int bitField0_;
       public static final int KEY_FIELD_NUMBER = 1;
-      private volatile java.lang.Object key_;
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object key_ = "";
       /**
        * required string key = 1;
        * @return Whether the key field is set.
        */
+      @java.lang.Override
       public boolean hasKey() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -14430,6 +14063,7 @@ public boolean hasKey() {
        * required string key = 1;
        * @return The key.
        */
+      @java.lang.Override
       public java.lang.String getKey() {
         java.lang.Object ref = key_;
         if (ref instanceof java.lang.String) {
@@ -14448,6 +14082,7 @@ public java.lang.String getKey() {
        * required string key = 1;
        * @return The bytes for key.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString
           getKeyBytes() {
         java.lang.Object ref = key_;
@@ -14468,6 +14103,7 @@ public java.lang.String getKey() {
        * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        * @return Whether the envelope field is set.
        */
+      @java.lang.Override
       public boolean hasEnvelope() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -14475,12 +14111,14 @@ public boolean hasEnvelope() {
        * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        * @return The envelope.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope() {
         return envelope_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder() {
         return envelope_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
       }
@@ -14517,7 +14155,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeMessage(2, getEnvelope());
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -14533,7 +14171,7 @@ public int getSerializedSize() {
           size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(2, getEnvelope());
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -14558,7 +14196,7 @@ public boolean equals(final java.lang.Object obj) {
           if (!getEnvelope()
               .equals(other.getEnvelope())) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -14577,7 +14215,7 @@ public int hashCode() {
           hash = (37 * hash) + ENVELOPE_FIELD_NUMBER;
           hash = (53 * hash) + getEnvelope().hashCode();
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -14626,11 +14264,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gos
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseDelimitedFrom(
           java.io.InputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -14711,14 +14351,13 @@ private void maybeForceBuilderInitialization() {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           key_ = "";
-          bitField0_ = (bitField0_ & ~0x00000001);
-          if (envelopeBuilder_ == null) {
-            envelope_ = null;
-          } else {
-            envelopeBuilder_.clear();
+          envelope_ = null;
+          if (envelopeBuilder_ != null) {
+            envelopeBuilder_.dispose();
+            envelopeBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
@@ -14745,23 +14384,25 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Ent
         @java.lang.Override
         public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry buildPartial() {
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.key_ = key_;
             to_bitField0_ |= 0x00000001;
           }
-          result.key_ = key_;
           if (((from_bitField0_ & 0x00000002) != 0)) {
-            if (envelopeBuilder_ == null) {
-              result.envelope_ = envelope_;
-            } else {
-              result.envelope_ = envelopeBuilder_.build();
-            }
+            result.envelope_ = envelopeBuilder_ == null
+                ? envelope_
+                : envelopeBuilder_.build();
             to_bitField0_ |= 0x00000002;
           }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -14809,14 +14450,14 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
         public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry other) {
           if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.getDefaultInstance()) return this;
           if (other.hasKey()) {
-            bitField0_ |= 0x00000001;
             key_ = other.key_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (other.hasEnvelope()) {
             mergeEnvelope(other.getEnvelope());
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -14840,17 +14481,42 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 10: {
+                  key_ = input.readBytes();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+                case 18: {
+                  input.readMessage(
+                      getEnvelopeFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
         private int bitField0_;
@@ -14905,11 +14571,9 @@ public java.lang.String getKey() {
          */
         public Builder setKey(
             java.lang.String value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+          if (value == null) { throw new NullPointerException(); }
           key_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -14918,8 +14582,8 @@ public Builder setKey(
          * @return This builder for chaining.
          */
         public Builder clearKey() {
-          bitField0_ = (bitField0_ & ~0x00000001);
           key_ = getDefaultInstance().getKey();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -14930,11 +14594,9 @@ public Builder clearKey() {
          */
         public Builder setKeyBytes(
             org.apache.pekko.protobufv3.internal.ByteString value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+          if (value == null) { throw new NullPointerException(); }
           key_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -14969,11 +14631,11 @@ public Builder setEnvelope(org.apache.pekko.cluster.ddata.protobuf.msg.Replicato
               throw new NullPointerException();
             }
             envelope_ = value;
-            onChanged();
           } else {
             envelopeBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /**
@@ -14983,11 +14645,11 @@ public Builder setEnvelope(
             org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder builderForValue) {
           if (envelopeBuilder_ == null) {
             envelope_ = builderForValue.build();
-            onChanged();
           } else {
             envelopeBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /**
@@ -14996,31 +14658,32 @@ public Builder setEnvelope(
         public Builder mergeEnvelope(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope value) {
           if (envelopeBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
-                envelope_ != null &&
-                envelope_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance()) {
-              envelope_ =
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.newBuilder(envelope_).mergeFrom(value).buildPartial();
+              envelope_ != null &&
+              envelope_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance()) {
+              getEnvelopeBuilder().mergeFrom(value);
             } else {
               envelope_ = value;
             }
-            onChanged();
           } else {
             envelopeBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000002;
+          if (envelope_ != null) {
+            bitField0_ |= 0x00000002;
+            onChanged();
+          }
           return this;
         }
         /**
          * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
          */
         public Builder clearEnvelope() {
-          if (envelopeBuilder_ == null) {
-            envelope_ = null;
-            onChanged();
-          } else {
-            envelopeBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000002);
+          envelope_ = null;
+          if (envelopeBuilder_ != null) {
+            envelopeBuilder_.dispose();
+            envelopeBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -15091,7 +14754,18 @@ public Entry parsePartialFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-          return new Entry(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
@@ -15113,11 +14787,12 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Ent
 
     private int bitField0_;
     public static final int SENDBACK_FIELD_NUMBER = 1;
-    private boolean sendBack_;
+    private boolean sendBack_ = false;
     /**
      * required bool sendBack = 1;
      * @return Whether the sendBack field is set.
      */
+    @java.lang.Override
     public boolean hasSendBack() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -15125,21 +14800,25 @@ public boolean hasSendBack() {
      * required bool sendBack = 1;
      * @return The sendBack.
      */
+    @java.lang.Override
     public boolean getSendBack() {
       return sendBack_;
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 2;
+    @SuppressWarnings("serial")
     private java.util.List entries_;
     /**
      * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
      */
+    @java.lang.Override
     public java.util.List getEntriesList() {
       return entries_;
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
      */
+    @java.lang.Override
     public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
@@ -15147,29 +14826,33 @@ public java.util.Listrepeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
      */
+    @java.lang.Override
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
     }
 
     public static final int TOSYSTEMUID_FIELD_NUMBER = 3;
-    private long toSystemUid_;
+    private long toSystemUid_ = 0L;
     /**
      * optional sfixed64 toSystemUid = 3;
      * @return Whether the toSystemUid field is set.
      */
+    @java.lang.Override
     public boolean hasToSystemUid() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -15177,16 +14860,18 @@ public boolean hasToSystemUid() {
      * optional sfixed64 toSystemUid = 3;
      * @return The toSystemUid.
      */
+    @java.lang.Override
     public long getToSystemUid() {
       return toSystemUid_;
     }
 
     public static final int FROMSYSTEMUID_FIELD_NUMBER = 4;
-    private long fromSystemUid_;
+    private long fromSystemUid_ = 0L;
     /**
      * optional sfixed64 fromSystemUid = 4;
      * @return Whether the fromSystemUid field is set.
      */
+    @java.lang.Override
     public boolean hasFromSystemUid() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -15194,6 +14879,7 @@ public boolean hasFromSystemUid() {
      * optional sfixed64 fromSystemUid = 4;
      * @return The fromSystemUid.
      */
+    @java.lang.Override
     public long getFromSystemUid() {
       return fromSystemUid_;
     }
@@ -15234,7 +14920,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeSFixed64(4, fromSystemUid_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -15259,7 +14945,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeSFixed64Size(4, fromSystemUid_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -15291,7 +14977,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getFromSystemUid()
             != other.getFromSystemUid()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -15321,7 +15007,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getFromSystemUid());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -15370,11 +15056,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gos
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -15438,35 +15126,28 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getEntriesFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         sendBack_ = false;
-        bitField0_ = (bitField0_ & ~0x00000001);
         if (entriesBuilder_ == null) {
           entries_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
+          entries_ = null;
           entriesBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000002);
         toSystemUid_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000004);
         fromSystemUid_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -15493,12 +15174,13 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip bui
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.sendBack_ = sendBack_;
-          to_bitField0_ |= 0x00000001;
-        }
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip result) {
         if (entriesBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
             entries_ = java.util.Collections.unmodifiableList(entries_);
@@ -15508,6 +15190,15 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip bui
         } else {
           result.entries_ = entriesBuilder_.build();
         }
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.sendBack_ = sendBack_;
+          to_bitField0_ |= 0x00000001;
+        }
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.toSystemUid_ = toSystemUid_;
           to_bitField0_ |= 0x00000002;
@@ -15516,9 +15207,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip bui
           result.fromSystemUid_ = fromSystemUid_;
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -15600,7 +15289,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
         if (other.hasFromSystemUid()) {
           setFromSystemUid(other.getFromSystemUid());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -15623,17 +15312,58 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                sendBack_ = input.readBool();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 18: {
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.PARSER,
+                        extensionRegistry);
+                if (entriesBuilder_ == null) {
+                  ensureEntriesIsMutable();
+                  entries_.add(m);
+                } else {
+                  entriesBuilder_.addMessage(m);
+                }
+                break;
+              } // case 18
+              case 25: {
+                toSystemUid_ = input.readSFixed64();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 25
+              case 33: {
+                fromSystemUid_ = input.readSFixed64();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 33
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -15643,6 +15373,7 @@ public Builder mergeFrom(
        * required bool sendBack = 1;
        * @return Whether the sendBack field is set.
        */
+      @java.lang.Override
       public boolean hasSendBack() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -15650,6 +15381,7 @@ public boolean hasSendBack() {
        * required bool sendBack = 1;
        * @return The sendBack.
        */
+      @java.lang.Override
       public boolean getSendBack() {
         return sendBack_;
       }
@@ -15659,8 +15391,9 @@ public boolean getSendBack() {
        * @return This builder for chaining.
        */
       public Builder setSendBack(boolean value) {
-        bitField0_ |= 0x00000001;
+
         sendBack_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -15920,6 +15653,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Ent
        * optional sfixed64 toSystemUid = 3;
        * @return Whether the toSystemUid field is set.
        */
+      @java.lang.Override
       public boolean hasToSystemUid() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -15927,6 +15661,7 @@ public boolean hasToSystemUid() {
        * optional sfixed64 toSystemUid = 3;
        * @return The toSystemUid.
        */
+      @java.lang.Override
       public long getToSystemUid() {
         return toSystemUid_;
       }
@@ -15936,8 +15671,9 @@ public long getToSystemUid() {
        * @return This builder for chaining.
        */
       public Builder setToSystemUid(long value) {
-        bitField0_ |= 0x00000004;
+
         toSystemUid_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -15957,6 +15693,7 @@ public Builder clearToSystemUid() {
        * optional sfixed64 fromSystemUid = 4;
        * @return Whether the fromSystemUid field is set.
        */
+      @java.lang.Override
       public boolean hasFromSystemUid() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -15964,6 +15701,7 @@ public boolean hasFromSystemUid() {
        * optional sfixed64 fromSystemUid = 4;
        * @return The fromSystemUid.
        */
+      @java.lang.Override
       public long getFromSystemUid() {
         return fromSystemUid_;
       }
@@ -15973,8 +15711,9 @@ public long getFromSystemUid() {
        * @return This builder for chaining.
        */
       public Builder setFromSystemUid(long value) {
-        bitField0_ |= 0x00000008;
+
         fromSystemUid_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -16021,7 +15760,18 @@ public Gossip parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Gossip(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -16106,7 +15856,7 @@ org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.DeltaPropagation}
    */
-  public  static final class DeltaPropagation extends
+  public static final class DeltaPropagation extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.DeltaPropagation)
       DeltaPropagationOrBuilder {
@@ -16126,79 +15876,6 @@ protected java.lang.Object newInstance(
       return new DeltaPropagation();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private DeltaPropagation(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = fromNode_.toBuilder();
-              }
-              fromNode_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(fromNode_);
-                fromNode_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                entries_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              entries_.add(
-                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.PARSER, extensionRegistry));
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000002;
-              reply_ = input.readBool();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          entries_ = java.util.Collections.unmodifiableList(entries_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_DeltaPropagation_descriptor;
@@ -16281,7 +15958,7 @@ public interface EntryOrBuilder extends
     /**
      * Protobuf type {@code org.apache.pekko.cluster.ddata.DeltaPropagation.Entry}
      */
-    public  static final class Entry extends
+    public static final class Entry extends
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.DeltaPropagation.Entry)
         EntryOrBuilder {
@@ -16301,78 +15978,6 @@ protected java.lang.Object newInstance(
         return new Entry();
       }
 
-      @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private Entry(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10: {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000001;
-                key_ = bs;
-                break;
-              }
-              case 18: {
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000002) != 0)) {
-                  subBuilder = envelope_.toBuilder();
-                }
-                envelope_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(envelope_);
-                  envelope_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000002;
-                break;
-              }
-              case 24: {
-                bitField0_ |= 0x00000004;
-                fromSeqNr_ = input.readInt64();
-                break;
-              }
-              case 32: {
-                bitField0_ |= 0x00000008;
-                toSeqNr_ = input.readInt64();
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_DeltaPropagation_Entry_descriptor;
@@ -16388,11 +15993,13 @@ private Entry(
 
       private int bitField0_;
       public static final int KEY_FIELD_NUMBER = 1;
-      private volatile java.lang.Object key_;
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object key_ = "";
       /**
        * required string key = 1;
        * @return Whether the key field is set.
        */
+      @java.lang.Override
       public boolean hasKey() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -16400,6 +16007,7 @@ public boolean hasKey() {
        * required string key = 1;
        * @return The key.
        */
+      @java.lang.Override
       public java.lang.String getKey() {
         java.lang.Object ref = key_;
         if (ref instanceof java.lang.String) {
@@ -16418,6 +16026,7 @@ public java.lang.String getKey() {
        * required string key = 1;
        * @return The bytes for key.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString
           getKeyBytes() {
         java.lang.Object ref = key_;
@@ -16438,6 +16047,7 @@ public java.lang.String getKey() {
        * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        * @return Whether the envelope field is set.
        */
+      @java.lang.Override
       public boolean hasEnvelope() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -16445,22 +16055,25 @@ public boolean hasEnvelope() {
        * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        * @return The envelope.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope() {
         return envelope_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder() {
         return envelope_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
       }
 
       public static final int FROMSEQNR_FIELD_NUMBER = 3;
-      private long fromSeqNr_;
+      private long fromSeqNr_ = 0L;
       /**
        * required int64 fromSeqNr = 3;
        * @return Whether the fromSeqNr field is set.
        */
+      @java.lang.Override
       public boolean hasFromSeqNr() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -16468,12 +16081,13 @@ public boolean hasFromSeqNr() {
        * required int64 fromSeqNr = 3;
        * @return The fromSeqNr.
        */
+      @java.lang.Override
       public long getFromSeqNr() {
         return fromSeqNr_;
       }
 
       public static final int TOSEQNR_FIELD_NUMBER = 4;
-      private long toSeqNr_;
+      private long toSeqNr_ = 0L;
       /**
        * 
        * if not set then same as fromSequenceNr
@@ -16482,6 +16096,7 @@ public long getFromSeqNr() {
        * optional int64 toSeqNr = 4;
        * @return Whether the toSeqNr field is set.
        */
+      @java.lang.Override
       public boolean hasToSeqNr() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -16493,6 +16108,7 @@ public boolean hasToSeqNr() {
        * optional int64 toSeqNr = 4;
        * @return The toSeqNr.
        */
+      @java.lang.Override
       public long getToSeqNr() {
         return toSeqNr_;
       }
@@ -16539,7 +16155,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         if (((bitField0_ & 0x00000008) != 0)) {
           output.writeInt64(4, toSeqNr_);
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -16563,7 +16179,7 @@ public int getSerializedSize() {
           size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeInt64Size(4, toSeqNr_);
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -16598,7 +16214,7 @@ public boolean equals(final java.lang.Object obj) {
           if (getToSeqNr()
               != other.getToSeqNr()) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -16627,7 +16243,7 @@ public int hashCode() {
           hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               getToSeqNr());
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -16676,11 +16292,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Del
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseDelimitedFrom(
           java.io.InputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -16761,18 +16379,15 @@ private void maybeForceBuilderInitialization() {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           key_ = "";
-          bitField0_ = (bitField0_ & ~0x00000001);
-          if (envelopeBuilder_ == null) {
-            envelope_ = null;
-          } else {
-            envelopeBuilder_.clear();
+          envelope_ = null;
+          if (envelopeBuilder_ != null) {
+            envelopeBuilder_.dispose();
+            envelopeBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000002);
           fromSeqNr_ = 0L;
-          bitField0_ = (bitField0_ & ~0x00000004);
           toSeqNr_ = 0L;
-          bitField0_ = (bitField0_ & ~0x00000008);
           return this;
         }
 
@@ -16799,18 +16414,22 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropa
         @java.lang.Override
         public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry buildPartial() {
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.key_ = key_;
             to_bitField0_ |= 0x00000001;
           }
-          result.key_ = key_;
           if (((from_bitField0_ & 0x00000002) != 0)) {
-            if (envelopeBuilder_ == null) {
-              result.envelope_ = envelope_;
-            } else {
-              result.envelope_ = envelopeBuilder_.build();
-            }
+            result.envelope_ = envelopeBuilder_ == null
+                ? envelope_
+                : envelopeBuilder_.build();
             to_bitField0_ |= 0x00000002;
           }
           if (((from_bitField0_ & 0x00000004) != 0)) {
@@ -16821,9 +16440,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropa
             result.toSeqNr_ = toSeqNr_;
             to_bitField0_ |= 0x00000008;
           }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -16871,8 +16488,8 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
         public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry other) {
           if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.getDefaultInstance()) return this;
           if (other.hasKey()) {
-            bitField0_ |= 0x00000001;
             key_ = other.key_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (other.hasEnvelope()) {
@@ -16884,7 +16501,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
           if (other.hasToSeqNr()) {
             setToSeqNr(other.getToSeqNr());
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -16911,17 +16528,52 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 10: {
+                  key_ = input.readBytes();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+                case 18: {
+                  input.readMessage(
+                      getEnvelopeFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                case 24: {
+                  fromSeqNr_ = input.readInt64();
+                  bitField0_ |= 0x00000004;
+                  break;
+                } // case 24
+                case 32: {
+                  toSeqNr_ = input.readInt64();
+                  bitField0_ |= 0x00000008;
+                  break;
+                } // case 32
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
         private int bitField0_;
@@ -16976,11 +16628,9 @@ public java.lang.String getKey() {
          */
         public Builder setKey(
             java.lang.String value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+          if (value == null) { throw new NullPointerException(); }
           key_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -16989,8 +16639,8 @@ public Builder setKey(
          * @return This builder for chaining.
          */
         public Builder clearKey() {
-          bitField0_ = (bitField0_ & ~0x00000001);
           key_ = getDefaultInstance().getKey();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -17001,11 +16651,9 @@ public Builder clearKey() {
          */
         public Builder setKeyBytes(
             org.apache.pekko.protobufv3.internal.ByteString value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+          if (value == null) { throw new NullPointerException(); }
           key_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -17040,11 +16688,11 @@ public Builder setEnvelope(org.apache.pekko.cluster.ddata.protobuf.msg.Replicato
               throw new NullPointerException();
             }
             envelope_ = value;
-            onChanged();
           } else {
             envelopeBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /**
@@ -17054,11 +16702,11 @@ public Builder setEnvelope(
             org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder builderForValue) {
           if (envelopeBuilder_ == null) {
             envelope_ = builderForValue.build();
-            onChanged();
           } else {
             envelopeBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /**
@@ -17067,31 +16715,32 @@ public Builder setEnvelope(
         public Builder mergeEnvelope(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope value) {
           if (envelopeBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
-                envelope_ != null &&
-                envelope_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance()) {
-              envelope_ =
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.newBuilder(envelope_).mergeFrom(value).buildPartial();
+              envelope_ != null &&
+              envelope_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance()) {
+              getEnvelopeBuilder().mergeFrom(value);
             } else {
               envelope_ = value;
             }
-            onChanged();
           } else {
             envelopeBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000002;
+          if (envelope_ != null) {
+            bitField0_ |= 0x00000002;
+            onChanged();
+          }
           return this;
         }
         /**
          * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
          */
         public Builder clearEnvelope() {
-          if (envelopeBuilder_ == null) {
-            envelope_ = null;
-            onChanged();
-          } else {
-            envelopeBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000002);
+          envelope_ = null;
+          if (envelopeBuilder_ != null) {
+            envelopeBuilder_.dispose();
+            envelopeBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -17135,6 +16784,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelo
          * required int64 fromSeqNr = 3;
          * @return Whether the fromSeqNr field is set.
          */
+        @java.lang.Override
         public boolean hasFromSeqNr() {
           return ((bitField0_ & 0x00000004) != 0);
         }
@@ -17142,6 +16792,7 @@ public boolean hasFromSeqNr() {
          * required int64 fromSeqNr = 3;
          * @return The fromSeqNr.
          */
+        @java.lang.Override
         public long getFromSeqNr() {
           return fromSeqNr_;
         }
@@ -17151,8 +16802,9 @@ public long getFromSeqNr() {
          * @return This builder for chaining.
          */
         public Builder setFromSeqNr(long value) {
-          bitField0_ |= 0x00000004;
+
           fromSeqNr_ = value;
+          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -17176,6 +16828,7 @@ public Builder clearFromSeqNr() {
          * optional int64 toSeqNr = 4;
          * @return Whether the toSeqNr field is set.
          */
+        @java.lang.Override
         public boolean hasToSeqNr() {
           return ((bitField0_ & 0x00000008) != 0);
         }
@@ -17187,6 +16840,7 @@ public boolean hasToSeqNr() {
          * optional int64 toSeqNr = 4;
          * @return The toSeqNr.
          */
+        @java.lang.Override
         public long getToSeqNr() {
           return toSeqNr_;
         }
@@ -17200,8 +16854,9 @@ public long getToSeqNr() {
          * @return This builder for chaining.
          */
         public Builder setToSeqNr(long value) {
-          bitField0_ |= 0x00000008;
+
           toSeqNr_ = value;
+          bitField0_ |= 0x00000008;
           onChanged();
           return this;
         }
@@ -17252,7 +16907,18 @@ public Entry parsePartialFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-          return new Entry(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
@@ -17279,6 +16945,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropa
      * required .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 1;
      * @return Whether the fromNode field is set.
      */
+    @java.lang.Override
     public boolean hasFromNode() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -17286,27 +16953,32 @@ public boolean hasFromNode() {
      * required .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 1;
      * @return The fromNode.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode() {
       return fromNode_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder() {
       return fromNode_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 2;
+    @SuppressWarnings("serial")
     private java.util.List entries_;
     /**
      * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
      */
+    @java.lang.Override
     public java.util.List getEntriesList() {
       return entries_;
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
      */
+    @java.lang.Override
     public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
@@ -17314,25 +16986,28 @@ public java.util.Listrepeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
      */
+    @java.lang.Override
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
     }
 
     public static final int REPLY_FIELD_NUMBER = 3;
-    private boolean reply_;
+    private boolean reply_ = false;
     /**
      * 
      * no reply if not set
@@ -17341,6 +17016,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropa
      * optional bool reply = 3;
      * @return Whether the reply field is set.
      */
+    @java.lang.Override
     public boolean hasReply() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -17352,6 +17028,7 @@ public boolean hasReply() {
      * optional bool reply = 3;
      * @return The reply.
      */
+    @java.lang.Override
     public boolean getReply() {
       return reply_;
     }
@@ -17393,7 +17070,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeBool(3, reply_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -17414,7 +17091,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(3, reply_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -17441,7 +17118,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getReply()
             != other.getReply()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -17465,7 +17142,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getReply());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -17514,11 +17191,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Del
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -17600,20 +17279,20 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (fromNodeBuilder_ == null) {
-          fromNode_ = null;
-        } else {
-          fromNodeBuilder_.clear();
+        bitField0_ = 0;
+        fromNode_ = null;
+        if (fromNodeBuilder_ != null) {
+          fromNodeBuilder_.dispose();
+          fromNodeBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         if (entriesBuilder_ == null) {
           entries_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
+          entries_ = null;
           entriesBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000002);
         reply_ = false;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -17640,16 +17319,13 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropa
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (fromNodeBuilder_ == null) {
-            result.fromNode_ = fromNode_;
-          } else {
-            result.fromNode_ = fromNodeBuilder_.build();
-          }
-          to_bitField0_ |= 0x00000001;
-        }
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation result) {
         if (entriesBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
             entries_ = java.util.Collections.unmodifiableList(entries_);
@@ -17659,13 +17335,22 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropa
         } else {
           result.entries_ = entriesBuilder_.build();
         }
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.fromNode_ = fromNodeBuilder_ == null
+              ? fromNode_
+              : fromNodeBuilder_.build();
+          to_bitField0_ |= 0x00000001;
+        }
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.reply_ = reply_;
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -17744,7 +17429,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
         if (other.hasReply()) {
           setReply(other.getReply());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -17770,17 +17455,55 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getFromNodeFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.PARSER,
+                        extensionRegistry);
+                if (entriesBuilder_ == null) {
+                  ensureEntriesIsMutable();
+                  entries_.add(m);
+                } else {
+                  entriesBuilder_.addMessage(m);
+                }
+                break;
+              } // case 18
+              case 24: {
+                reply_ = input.readBool();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -17815,11 +17538,11 @@ public Builder setFromNode(org.apache.pekko.cluster.ddata.protobuf.msg.Replicato
             throw new NullPointerException();
           }
           fromNode_ = value;
-          onChanged();
         } else {
           fromNodeBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -17829,11 +17552,11 @@ public Builder setFromNode(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
         if (fromNodeBuilder_ == null) {
           fromNode_ = builderForValue.build();
-          onChanged();
         } else {
           fromNodeBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -17842,31 +17565,32 @@ public Builder setFromNode(
       public Builder mergeFromNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
         if (fromNodeBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              fromNode_ != null &&
-              fromNode_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
-            fromNode_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(fromNode_).mergeFrom(value).buildPartial();
+            fromNode_ != null &&
+            fromNode_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
+            getFromNodeBuilder().mergeFrom(value);
           } else {
             fromNode_ = value;
           }
-          onChanged();
         } else {
           fromNodeBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (fromNode_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 1;
        */
       public Builder clearFromNode() {
-        if (fromNodeBuilder_ == null) {
-          fromNode_ = null;
-          onChanged();
-        } else {
-          fromNodeBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        fromNode_ = null;
+        if (fromNodeBuilder_ != null) {
+          fromNodeBuilder_.dispose();
+          fromNodeBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -18154,6 +17878,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropa
        * optional bool reply = 3;
        * @return Whether the reply field is set.
        */
+      @java.lang.Override
       public boolean hasReply() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -18165,6 +17890,7 @@ public boolean hasReply() {
        * optional bool reply = 3;
        * @return The reply.
        */
+      @java.lang.Override
       public boolean getReply() {
         return reply_;
       }
@@ -18178,8 +17904,9 @@ public boolean getReply() {
        * @return This builder for chaining.
        */
       public Builder setReply(boolean value) {
-        bitField0_ |= 0x00000004;
+
         reply_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -18230,7 +17957,18 @@ public DeltaPropagation parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new DeltaPropagation(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -18302,7 +18040,7 @@ public interface UniqueAddressOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.UniqueAddress}
    */
-  public  static final class UniqueAddress extends
+  public static final class UniqueAddress extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.UniqueAddress)
       UniqueAddressOrBuilder {
@@ -18321,72 +18059,6 @@ protected java.lang.Object newInstance(
       return new UniqueAddress();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private UniqueAddress(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = address_.toBuilder();
-              }
-              address_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(address_);
-                address_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 21: {
-              bitField0_ |= 0x00000002;
-              uid_ = input.readSFixed32();
-              break;
-            }
-            case 29: {
-              bitField0_ |= 0x00000004;
-              uid2_ = input.readSFixed32();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_UniqueAddress_descriptor;
@@ -18407,6 +18079,7 @@ private UniqueAddress(
      * required .org.apache.pekko.cluster.ddata.Address address = 1;
      * @return Whether the address field is set.
      */
+    @java.lang.Override
     public boolean hasAddress() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -18414,22 +18087,25 @@ public boolean hasAddress() {
      * required .org.apache.pekko.cluster.ddata.Address address = 1;
      * @return The address.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address getAddress() {
       return address_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance() : address_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.Address address = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder getAddressOrBuilder() {
       return address_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance() : address_;
     }
 
     public static final int UID_FIELD_NUMBER = 2;
-    private int uid_;
+    private int uid_ = 0;
     /**
      * required sfixed32 uid = 2;
      * @return Whether the uid field is set.
      */
+    @java.lang.Override
     public boolean hasUid() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -18437,12 +18113,13 @@ public boolean hasUid() {
      * required sfixed32 uid = 2;
      * @return The uid.
      */
+    @java.lang.Override
     public int getUid() {
       return uid_;
     }
 
     public static final int UID2_FIELD_NUMBER = 3;
-    private int uid2_;
+    private int uid2_ = 0;
     /**
      * 
      * 64 bit uids but with backward wire compatibility
@@ -18451,6 +18128,7 @@ public int getUid() {
      * optional sfixed32 uid2 = 3;
      * @return Whether the uid2 field is set.
      */
+    @java.lang.Override
     public boolean hasUid2() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -18462,6 +18140,7 @@ public boolean hasUid2() {
      * optional sfixed32 uid2 = 3;
      * @return The uid2.
      */
+    @java.lang.Override
     public int getUid2() {
       return uid2_;
     }
@@ -18501,7 +18180,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeSFixed32(3, uid2_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -18522,7 +18201,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeSFixed32Size(3, uid2_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -18552,7 +18231,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getUid2()
             != other.getUid2()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -18575,7 +18254,7 @@ public int hashCode() {
         hash = (37 * hash) + UID2_FIELD_NUMBER;
         hash = (53 * hash) + getUid2();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -18624,11 +18303,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Uni
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -18709,16 +18390,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (addressBuilder_ == null) {
-          address_ = null;
-        } else {
-          addressBuilder_.clear();
+        bitField0_ = 0;
+        address_ = null;
+        if (addressBuilder_ != null) {
+          addressBuilder_.dispose();
+          addressBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         uid_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         uid2_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -18745,14 +18424,18 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddr
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (addressBuilder_ == null) {
-            result.address_ = address_;
-          } else {
-            result.address_ = addressBuilder_.build();
-          }
+          result.address_ = addressBuilder_ == null
+              ? address_
+              : addressBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
@@ -18763,9 +18446,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddr
           result.uid2_ = uid2_;
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -18821,7 +18502,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
         if (other.hasUid2()) {
           setUid2(other.getUid2());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -18845,17 +18526,47 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getAddressFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 21: {
+                uid_ = input.readSFixed32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 21
+              case 29: {
+                uid2_ = input.readSFixed32();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 29
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -18890,11 +18601,11 @@ public Builder setAddress(org.apache.pekko.cluster.ddata.protobuf.msg.Replicator
             throw new NullPointerException();
           }
           address_ = value;
-          onChanged();
         } else {
           addressBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -18904,11 +18615,11 @@ public Builder setAddress(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder builderForValue) {
         if (addressBuilder_ == null) {
           address_ = builderForValue.build();
-          onChanged();
         } else {
           addressBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -18917,31 +18628,32 @@ public Builder setAddress(
       public Builder mergeAddress(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address value) {
         if (addressBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              address_ != null &&
-              address_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance()) {
-            address_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.newBuilder(address_).mergeFrom(value).buildPartial();
+            address_ != null &&
+            address_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance()) {
+            getAddressBuilder().mergeFrom(value);
           } else {
             address_ = value;
           }
-          onChanged();
         } else {
           addressBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (address_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.Address address = 1;
        */
       public Builder clearAddress() {
-        if (addressBuilder_ == null) {
-          address_ = null;
-          onChanged();
-        } else {
-          addressBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        address_ = null;
+        if (addressBuilder_ != null) {
+          addressBuilder_.dispose();
+          addressBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -18985,6 +18697,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrB
        * required sfixed32 uid = 2;
        * @return Whether the uid field is set.
        */
+      @java.lang.Override
       public boolean hasUid() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -18992,6 +18705,7 @@ public boolean hasUid() {
        * required sfixed32 uid = 2;
        * @return The uid.
        */
+      @java.lang.Override
       public int getUid() {
         return uid_;
       }
@@ -19001,8 +18715,9 @@ public int getUid() {
        * @return This builder for chaining.
        */
       public Builder setUid(int value) {
-        bitField0_ |= 0x00000002;
+
         uid_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -19026,6 +18741,7 @@ public Builder clearUid() {
        * optional sfixed32 uid2 = 3;
        * @return Whether the uid2 field is set.
        */
+      @java.lang.Override
       public boolean hasUid2() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -19037,6 +18753,7 @@ public boolean hasUid2() {
        * optional sfixed32 uid2 = 3;
        * @return The uid2.
        */
+      @java.lang.Override
       public int getUid2() {
         return uid2_;
       }
@@ -19050,8 +18767,9 @@ public int getUid2() {
        * @return This builder for chaining.
        */
       public Builder setUid2(int value) {
-        bitField0_ |= 0x00000004;
+
         uid2_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -19102,7 +18820,18 @@ public UniqueAddress parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new UniqueAddress(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -19157,7 +18886,7 @@ public interface AddressOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.Address}
    */
-  public  static final class Address extends
+  public static final class Address extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Address)
       AddressOrBuilder {
@@ -19167,70 +18896,16 @@ private Address(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder<
       super(builder);
     }
     private Address() {
-      hostname_ = "";
-    }
-
-    @java.lang.Override
-    @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(
-        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
-      return new Address();
-    }
-
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Address(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              hostname_ = bs;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              port_ = input.readUInt32();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
+      hostname_ = "";
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+      return new Address();
     }
+
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_Address_descriptor;
@@ -19246,11 +18921,13 @@ private Address(
 
     private int bitField0_;
     public static final int HOSTNAME_FIELD_NUMBER = 1;
-    private volatile java.lang.Object hostname_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object hostname_ = "";
     /**
      * required string hostname = 1;
      * @return Whether the hostname field is set.
      */
+    @java.lang.Override
     public boolean hasHostname() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -19258,6 +18935,7 @@ public boolean hasHostname() {
      * required string hostname = 1;
      * @return The hostname.
      */
+    @java.lang.Override
     public java.lang.String getHostname() {
       java.lang.Object ref = hostname_;
       if (ref instanceof java.lang.String) {
@@ -19276,6 +18954,7 @@ public java.lang.String getHostname() {
      * required string hostname = 1;
      * @return The bytes for hostname.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getHostnameBytes() {
       java.lang.Object ref = hostname_;
@@ -19291,11 +18970,12 @@ public java.lang.String getHostname() {
     }
 
     public static final int PORT_FIELD_NUMBER = 2;
-    private int port_;
+    private int port_ = 0;
     /**
      * required uint32 port = 2;
      * @return Whether the port field is set.
      */
+    @java.lang.Override
     public boolean hasPort() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -19303,6 +18983,7 @@ public boolean hasPort() {
      * required uint32 port = 2;
      * @return The port.
      */
+    @java.lang.Override
     public int getPort() {
       return port_;
     }
@@ -19335,7 +19016,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeUInt32(2, port_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -19351,7 +19032,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(2, port_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -19376,7 +19057,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getPort()
             != other.getPort()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -19395,7 +19076,7 @@ public int hashCode() {
         hash = (37 * hash) + PORT_FIELD_NUMBER;
         hash = (53 * hash) + getPort();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -19444,11 +19125,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Add
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -19512,26 +19195,20 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         hostname_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         port_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -19558,19 +19235,23 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address bu
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.hostname_ = hostname_;
           to_bitField0_ |= 0x00000001;
         }
-        result.hostname_ = hostname_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.port_ = port_;
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -19618,14 +19299,14 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address other) {
         if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance()) return this;
         if (other.hasHostname()) {
-          bitField0_ |= 0x00000001;
           hostname_ = other.hostname_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasPort()) {
           setPort(other.getPort());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -19646,17 +19327,40 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                hostname_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                port_ = input.readUInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -19711,11 +19415,9 @@ public java.lang.String getHostname() {
        */
       public Builder setHostname(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         hostname_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -19724,8 +19426,8 @@ public Builder setHostname(
        * @return This builder for chaining.
        */
       public Builder clearHostname() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         hostname_ = getDefaultInstance().getHostname();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -19736,11 +19438,9 @@ public Builder clearHostname() {
        */
       public Builder setHostnameBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         hostname_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -19750,6 +19450,7 @@ public Builder setHostnameBytes(
        * required uint32 port = 2;
        * @return Whether the port field is set.
        */
+      @java.lang.Override
       public boolean hasPort() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -19757,6 +19458,7 @@ public boolean hasPort() {
        * required uint32 port = 2;
        * @return The port.
        */
+      @java.lang.Override
       public int getPort() {
         return port_;
       }
@@ -19766,8 +19468,9 @@ public int getPort() {
        * @return This builder for chaining.
        */
       public Builder setPort(int value) {
-        bitField0_ |= 0x00000002;
+
         port_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -19814,7 +19517,18 @@ public Address parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Address(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -19865,7 +19579,7 @@ org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Ent
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.VersionVector}
    */
-  public  static final class VersionVector extends
+  public static final class VersionVector extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.VersionVector)
       VersionVectorOrBuilder {
@@ -19885,61 +19599,6 @@ protected java.lang.Object newInstance(
       return new VersionVector();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private VersionVector(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                entries_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              entries_.add(
-                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          entries_ = java.util.Collections.unmodifiableList(entries_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_VersionVector_descriptor;
@@ -19986,7 +19645,7 @@ public interface EntryOrBuilder extends
     /**
      * Protobuf type {@code org.apache.pekko.cluster.ddata.VersionVector.Entry}
      */
-    public  static final class Entry extends
+    public static final class Entry extends
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.VersionVector.Entry)
         EntryOrBuilder {
@@ -20005,67 +19664,6 @@ protected java.lang.Object newInstance(
         return new Entry();
       }
 
-      @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private Entry(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10: {
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000001) != 0)) {
-                  subBuilder = node_.toBuilder();
-                }
-                node_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(node_);
-                  node_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000001;
-                break;
-              }
-              case 16: {
-                bitField0_ |= 0x00000002;
-                version_ = input.readInt64();
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_VersionVector_Entry_descriptor;
@@ -20086,6 +19684,7 @@ private Entry(
        * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
        * @return Whether the node field is set.
        */
+      @java.lang.Override
       public boolean hasNode() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -20093,22 +19692,25 @@ public boolean hasNode() {
        * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
        * @return The node.
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode() {
         return node_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
        */
+      @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder() {
         return node_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
       }
 
       public static final int VERSION_FIELD_NUMBER = 2;
-      private long version_;
+      private long version_ = 0L;
       /**
        * required int64 version = 2;
        * @return Whether the version field is set.
        */
+      @java.lang.Override
       public boolean hasVersion() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -20116,6 +19718,7 @@ public boolean hasVersion() {
        * required int64 version = 2;
        * @return The version.
        */
+      @java.lang.Override
       public long getVersion() {
         return version_;
       }
@@ -20152,7 +19755,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeInt64(2, version_);
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -20169,7 +19772,7 @@ public int getSerializedSize() {
           size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeInt64Size(2, version_);
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -20194,7 +19797,7 @@ public boolean equals(final java.lang.Object obj) {
           if (getVersion()
               != other.getVersion()) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -20214,7 +19817,7 @@ public int hashCode() {
           hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               getVersion());
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -20263,11 +19866,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Ver
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
+
       public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseDelimitedFrom(
           java.io.InputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -20348,14 +19953,13 @@ private void maybeForceBuilderInitialization() {
         @java.lang.Override
         public Builder clear() {
           super.clear();
-          if (nodeBuilder_ == null) {
-            node_ = null;
-          } else {
-            nodeBuilder_.clear();
+          bitField0_ = 0;
+          node_ = null;
+          if (nodeBuilder_ != null) {
+            nodeBuilder_.dispose();
+            nodeBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000001);
           version_ = 0L;
-          bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
@@ -20382,23 +19986,25 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVec
         @java.lang.Override
         public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry buildPartial() {
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
-            if (nodeBuilder_ == null) {
-              result.node_ = node_;
-            } else {
-              result.node_ = nodeBuilder_.build();
-            }
+            result.node_ = nodeBuilder_ == null
+                ? node_
+                : nodeBuilder_.build();
             to_bitField0_ |= 0x00000001;
           }
           if (((from_bitField0_ & 0x00000002) != 0)) {
             result.version_ = version_;
             to_bitField0_ |= 0x00000002;
           }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -20451,7 +20057,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
           if (other.hasVersion()) {
             setVersion(other.getVersion());
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -20475,17 +20081,42 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 10: {
+                  input.readMessage(
+                      getNodeFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+                case 16: {
+                  version_ = input.readInt64();
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 16
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
         private int bitField0_;
@@ -20520,11 +20151,11 @@ public Builder setNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMes
               throw new NullPointerException();
             }
             node_ = value;
-            onChanged();
           } else {
             nodeBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000001;
+          onChanged();
           return this;
         }
         /**
@@ -20534,11 +20165,11 @@ public Builder setNode(
             org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
           if (nodeBuilder_ == null) {
             node_ = builderForValue.build();
-            onChanged();
           } else {
             nodeBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000001;
+          onChanged();
           return this;
         }
         /**
@@ -20547,31 +20178,32 @@ public Builder setNode(
         public Builder mergeNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
           if (nodeBuilder_ == null) {
             if (((bitField0_ & 0x00000001) != 0) &&
-                node_ != null &&
-                node_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
-              node_ =
-                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(node_).mergeFrom(value).buildPartial();
+              node_ != null &&
+              node_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
+              getNodeBuilder().mergeFrom(value);
             } else {
               node_ = value;
             }
-            onChanged();
           } else {
             nodeBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000001;
+          if (node_ != null) {
+            bitField0_ |= 0x00000001;
+            onChanged();
+          }
           return this;
         }
         /**
          * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
          */
         public Builder clearNode() {
-          if (nodeBuilder_ == null) {
-            node_ = null;
-            onChanged();
-          } else {
-            nodeBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000001);
+          node_ = null;
+          if (nodeBuilder_ != null) {
+            nodeBuilder_.dispose();
+            nodeBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -20615,6 +20247,7 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddr
          * required int64 version = 2;
          * @return Whether the version field is set.
          */
+        @java.lang.Override
         public boolean hasVersion() {
           return ((bitField0_ & 0x00000002) != 0);
         }
@@ -20622,6 +20255,7 @@ public boolean hasVersion() {
          * required int64 version = 2;
          * @return The version.
          */
+        @java.lang.Override
         public long getVersion() {
           return version_;
         }
@@ -20631,8 +20265,9 @@ public long getVersion() {
          * @return This builder for chaining.
          */
         public Builder setVersion(long value) {
-          bitField0_ |= 0x00000002;
+
           version_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -20679,7 +20314,18 @@ public Entry parsePartialFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-          return new Entry(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
@@ -20700,16 +20346,19 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVec
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 1;
+    @SuppressWarnings("serial")
     private java.util.List entries_;
     /**
      * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
      */
+    @java.lang.Override
     public java.util.List getEntriesList() {
       return entries_;
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
      */
+    @java.lang.Override
     public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
@@ -20717,18 +20366,21 @@ public java.util.Listrepeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
      */
+    @java.lang.Override
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
@@ -20757,7 +20409,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < entries_.size(); i++) {
         output.writeMessage(1, entries_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -20770,7 +20422,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, entries_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -20787,7 +20439,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getEntriesList()
           .equals(other.getEntriesList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -20802,7 +20454,7 @@ public int hashCode() {
         hash = (37 * hash) + ENTRIES_FIELD_NUMBER;
         hash = (53 * hash) + getEntriesList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -20851,11 +20503,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Ver
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -20919,29 +20573,25 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getEntriesFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (entriesBuilder_ == null) {
           entries_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
+          entries_ = null;
           entriesBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -20968,7 +20618,13 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVec
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector(this);
-        int from_bitField0_ = bitField0_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector result) {
         if (entriesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             entries_ = java.util.Collections.unmodifiableList(entries_);
@@ -20978,8 +20634,10 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVec
         } else {
           result.entries_ = entriesBuilder_.build();
         }
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector result) {
+        int from_bitField0_ = bitField0_;
       }
 
       @java.lang.Override
@@ -21052,7 +20710,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -21072,17 +20730,43 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.PARSER,
+                        extensionRegistry);
+                if (entriesBuilder_ == null) {
+                  ensureEntriesIsMutable();
+                  entries_.add(m);
+                } else {
+                  entriesBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -21359,7 +21043,18 @@ public VersionVector parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new VersionVector(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -21419,7 +21114,7 @@ public interface OtherMessageOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.OtherMessage}
    */
-  public  static final class OtherMessage extends
+  public static final class OtherMessage extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.OtherMessage)
       OtherMessageOrBuilder {
@@ -21428,76 +21123,18 @@ public  static final class OtherMessage extends
     private OtherMessage(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
-    private OtherMessage() {
-      enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-      messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-    }
-
-    @java.lang.Override
-    @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(
-        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
-      return new OtherMessage();
-    }
-
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private OtherMessage(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              bitField0_ |= 0x00000001;
-              enclosedMessage_ = input.readBytes();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              serializerId_ = input.readInt32();
-              break;
-            }
-            case 34: {
-              bitField0_ |= 0x00000004;
-              messageManifest_ = input.readBytes();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
+    private OtherMessage() {
+      enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
+      messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+      return new OtherMessage();
+    }
+
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_OtherMessage_descriptor;
@@ -21513,11 +21150,12 @@ private OtherMessage(
 
     private int bitField0_;
     public static final int ENCLOSEDMESSAGE_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.ByteString enclosedMessage_;
+    private org.apache.pekko.protobufv3.internal.ByteString enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * required bytes enclosedMessage = 1;
      * @return Whether the enclosedMessage field is set.
      */
+    @java.lang.Override
     public boolean hasEnclosedMessage() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -21525,16 +21163,18 @@ public boolean hasEnclosedMessage() {
      * required bytes enclosedMessage = 1;
      * @return The enclosedMessage.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
       return enclosedMessage_;
     }
 
     public static final int SERIALIZERID_FIELD_NUMBER = 2;
-    private int serializerId_;
+    private int serializerId_ = 0;
     /**
      * required int32 serializerId = 2;
      * @return Whether the serializerId field is set.
      */
+    @java.lang.Override
     public boolean hasSerializerId() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -21542,16 +21182,18 @@ public boolean hasSerializerId() {
      * required int32 serializerId = 2;
      * @return The serializerId.
      */
+    @java.lang.Override
     public int getSerializerId() {
       return serializerId_;
     }
 
     public static final int MESSAGEMANIFEST_FIELD_NUMBER = 4;
-    private org.apache.pekko.protobufv3.internal.ByteString messageManifest_;
+    private org.apache.pekko.protobufv3.internal.ByteString messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * optional bytes messageManifest = 4;
      * @return Whether the messageManifest field is set.
      */
+    @java.lang.Override
     public boolean hasMessageManifest() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -21559,6 +21201,7 @@ public boolean hasMessageManifest() {
      * optional bytes messageManifest = 4;
      * @return The messageManifest.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
       return messageManifest_;
     }
@@ -21594,7 +21237,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeBytes(4, messageManifest_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -21615,7 +21258,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(4, messageManifest_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -21645,7 +21288,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getMessageManifest()
             .equals(other.getMessageManifest())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -21668,7 +21311,7 @@ public int hashCode() {
         hash = (37 * hash) + MESSAGEMANIFEST_FIELD_NUMBER;
         hash = (53 * hash) + getMessageManifest().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -21717,11 +21360,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Oth
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -21785,28 +21430,21 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
         serializerId_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -21833,23 +21471,27 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessa
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.enclosedMessage_ = enclosedMessage_;
           to_bitField0_ |= 0x00000001;
         }
-        result.enclosedMessage_ = enclosedMessage_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.serializerId_ = serializerId_;
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.messageManifest_ = messageManifest_;
           to_bitField0_ |= 0x00000004;
         }
-        result.messageManifest_ = messageManifest_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -21905,7 +21547,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
         if (other.hasMessageManifest()) {
           setMessageManifest(other.getMessageManifest());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -21926,17 +21568,45 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                enclosedMessage_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                serializerId_ = input.readInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 34: {
+                messageManifest_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 34
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -21946,6 +21616,7 @@ public Builder mergeFrom(
        * required bytes enclosedMessage = 1;
        * @return Whether the enclosedMessage field is set.
        */
+      @java.lang.Override
       public boolean hasEnclosedMessage() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -21953,6 +21624,7 @@ public boolean hasEnclosedMessage() {
        * required bytes enclosedMessage = 1;
        * @return The enclosedMessage.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
         return enclosedMessage_;
       }
@@ -21962,11 +21634,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
        * @return This builder for chaining.
        */
       public Builder setEnclosedMessage(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         enclosedMessage_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -21986,6 +21656,7 @@ public Builder clearEnclosedMessage() {
        * required int32 serializerId = 2;
        * @return Whether the serializerId field is set.
        */
+      @java.lang.Override
       public boolean hasSerializerId() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -21993,6 +21664,7 @@ public boolean hasSerializerId() {
        * required int32 serializerId = 2;
        * @return The serializerId.
        */
+      @java.lang.Override
       public int getSerializerId() {
         return serializerId_;
       }
@@ -22002,8 +21674,9 @@ public int getSerializerId() {
        * @return This builder for chaining.
        */
       public Builder setSerializerId(int value) {
-        bitField0_ |= 0x00000002;
+
         serializerId_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -22023,6 +21696,7 @@ public Builder clearSerializerId() {
        * optional bytes messageManifest = 4;
        * @return Whether the messageManifest field is set.
        */
+      @java.lang.Override
       public boolean hasMessageManifest() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -22030,6 +21704,7 @@ public boolean hasMessageManifest() {
        * optional bytes messageManifest = 4;
        * @return The messageManifest.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
         return messageManifest_;
       }
@@ -22039,11 +21714,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
        * @return This builder for chaining.
        */
       public Builder setMessageManifest(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         messageManifest_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -22090,7 +21763,18 @@ public OtherMessage parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new OtherMessage(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -22142,7 +21826,7 @@ public interface StringGSetOrBuilder extends
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.StringGSet}
    */
-  public  static final class StringGSet extends
+  public static final class StringGSet extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.StringGSet)
       StringGSetOrBuilder {
@@ -22152,7 +21836,8 @@ private StringGSet(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Build
       super(builder);
     }
     private StringGSet() {
-      elements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      elements_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -22162,61 +21847,6 @@ protected java.lang.Object newInstance(
       return new StringGSet();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private StringGSet(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                elements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              elements_.add(bs);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          elements_ = elements_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_StringGSet_descriptor;
@@ -22231,7 +21861,9 @@ private StringGSet(
     }
 
     public static final int ELEMENTS_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.LazyStringList elements_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList elements_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string elements = 1;
      * @return A list containing the elements.
@@ -22282,7 +21914,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < elements_.size(); i++) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, elements_.getRaw(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -22299,7 +21931,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getElementsList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -22316,7 +21948,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getElementsList()
           .equals(other.getElementsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -22331,7 +21963,7 @@ public int hashCode() {
         hash = (37 * hash) + ELEMENTS_FIELD_NUMBER;
         hash = (53 * hash) + getElementsList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -22380,11 +22012,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Str
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -22448,24 +22082,20 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        elements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = 0;
+        elements_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         return this;
       }
 
@@ -22492,16 +22122,19 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet(this);
-        int from_bitField0_ = bitField0_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          elements_ = elements_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.elements_ = elements_;
+        if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          elements_.makeImmutable();
+          result.elements_ = elements_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -22549,14 +22182,14 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
         if (!other.elements_.isEmpty()) {
           if (elements_.isEmpty()) {
             elements_ = other.elements_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ |= 0x00000001;
           } else {
             ensureElementsIsMutable();
             elements_.addAll(other.elements_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -22571,27 +22204,47 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureElementsIsMutable();
+                elements_.add(bs);
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList elements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList elements_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureElementsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!elements_.isModifiable()) {
           elements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(elements_);
-          bitField0_ |= 0x00000001;
-         }
+        }
+        bitField0_ |= 0x00000001;
       }
       /**
        * repeated string elements = 1;
@@ -22599,7 +22252,8 @@ private void ensureElementsIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getElementsList() {
-        return elements_.getUnmodifiableView();
+        elements_.makeImmutable();
+        return elements_;
       }
       /**
        * repeated string elements = 1;
@@ -22633,11 +22287,10 @@ public java.lang.String getElements(int index) {
        */
       public Builder setElements(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureElementsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureElementsIsMutable();
         elements_.set(index, value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -22648,11 +22301,10 @@ public Builder setElements(
        */
       public Builder addElements(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureElementsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureElementsIsMutable();
         elements_.add(value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -22666,6 +22318,7 @@ public Builder addAllElements(
         ensureElementsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, elements_);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -22674,8 +22327,9 @@ public Builder addAllElements(
        * @return This builder for chaining.
        */
       public Builder clearElements() {
-        elements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        elements_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);;
         onChanged();
         return this;
       }
@@ -22686,11 +22340,10 @@ public Builder clearElements() {
        */
       public Builder addElementsBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureElementsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureElementsIsMutable();
         elements_.add(value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -22727,7 +22380,18 @@ public StringGSet parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new StringGSet(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -22793,7 +22457,7 @@ org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Prun
   /**
    * Protobuf type {@code org.apache.pekko.cluster.ddata.DurableDataEnvelope}
    */
-  public  static final class DurableDataEnvelope extends
+  public static final class DurableDataEnvelope extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.DurableDataEnvelope)
       DurableDataEnvelopeOrBuilder {
@@ -22813,74 +22477,6 @@ protected java.lang.Object newInstance(
       return new DurableDataEnvelope();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private DurableDataEnvelope(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = data_.toBuilder();
-              }
-              data_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(data_);
-                data_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                pruning_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              pruning_.add(
-                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          pruning_ = java.util.Collections.unmodifiableList(pruning_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_org_apache_pekko_cluster_ddata_DurableDataEnvelope_descriptor;
@@ -22901,6 +22497,7 @@ private DurableDataEnvelope(
      * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
      * @return Whether the data field is set.
      */
+    @java.lang.Override
     public boolean hasData() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -22908,27 +22505,32 @@ public boolean hasData() {
      * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
      * @return The data.
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData() {
       return data_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
     }
     /**
      * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder() {
       return data_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
     }
 
     public static final int PRUNING_FIELD_NUMBER = 2;
+    @SuppressWarnings("serial")
     private java.util.List pruning_;
     /**
      * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
+    @java.lang.Override
     public java.util.List getPruningList() {
       return pruning_;
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
+    @java.lang.Override
     public java.util.List 
         getPruningOrBuilderList() {
       return pruning_;
@@ -22936,18 +22538,21 @@ public java.util.Listrepeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
+    @java.lang.Override
     public int getPruningCount() {
       return pruning_.size();
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry getPruning(int index) {
       return pruning_.get(index);
     }
     /**
      * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder getPruningOrBuilder(
         int index) {
       return pruning_.get(index);
@@ -22987,7 +22592,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < pruning_.size(); i++) {
         output.writeMessage(2, pruning_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -23004,7 +22609,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, pruning_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -23026,7 +22631,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getPruningList()
           .equals(other.getPruningList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -23045,7 +22650,7 @@ public int hashCode() {
         hash = (37 * hash) + PRUNING_FIELD_NUMBER;
         hash = (53 * hash) + getPruningList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -23094,11 +22699,13 @@ public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Dur
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -23180,18 +22787,19 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (dataBuilder_ == null) {
-          data_ = null;
-        } else {
-          dataBuilder_.clear();
+        bitField0_ = 0;
+        data_ = null;
+        if (dataBuilder_ != null) {
+          dataBuilder_.dispose();
+          dataBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         if (pruningBuilder_ == null) {
           pruning_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
+          pruning_ = null;
           pruningBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -23218,16 +22826,13 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDat
       @java.lang.Override
       public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope buildPartial() {
         org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (dataBuilder_ == null) {
-            result.data_ = data_;
-          } else {
-            result.data_ = dataBuilder_.build();
-          }
-          to_bitField0_ |= 0x00000001;
-        }
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope result) {
         if (pruningBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
             pruning_ = java.util.Collections.unmodifiableList(pruning_);
@@ -23237,9 +22842,18 @@ public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDat
         } else {
           result.pruning_ = pruningBuilder_.build();
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.data_ = dataBuilder_ == null
+              ? data_
+              : dataBuilder_.build();
+          to_bitField0_ |= 0x00000001;
+        }
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -23315,7 +22929,7 @@ public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorM
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -23341,17 +22955,50 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getDataFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry m =
+                    input.readMessage(
+                        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.PARSER,
+                        extensionRegistry);
+                if (pruningBuilder_ == null) {
+                  ensurePruningIsMutable();
+                  pruning_.add(m);
+                } else {
+                  pruningBuilder_.addMessage(m);
+                }
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -23386,11 +23033,11 @@ public Builder setData(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMes
             throw new NullPointerException();
           }
           data_ = value;
-          onChanged();
         } else {
           dataBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -23400,11 +23047,11 @@ public Builder setData(
           org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (dataBuilder_ == null) {
           data_ = builderForValue.build();
-          onChanged();
         } else {
           dataBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -23413,31 +23060,32 @@ public Builder setData(
       public Builder mergeData(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (dataBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              data_ != null &&
-              data_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
-            data_ =
-              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(data_).mergeFrom(value).buildPartial();
+            data_ != null &&
+            data_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+            getDataBuilder().mergeFrom(value);
           } else {
             data_ = value;
           }
-          onChanged();
         } else {
           dataBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (data_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
        */
       public Builder clearData() {
-        if (dataBuilder_ == null) {
-          data_ = null;
-          onChanged();
-        } else {
-          dataBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        data_ = null;
+        if (dataBuilder_ != null) {
+          dataBuilder_.dispose();
+          dataBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -23748,7 +23396,18 @@ public DurableDataEnvelope parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new DurableDataEnvelope(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
diff --git a/docs/src/main/java/docs/ddata/protobuf/msg/TwoPhaseSetMessages.java b/docs/src/main/java/docs/ddata/protobuf/msg/TwoPhaseSetMessages.java
index a5331180ae1..533d10fead5 100644
--- a/docs/src/main/java/docs/ddata/protobuf/msg/TwoPhaseSetMessages.java
+++ b/docs/src/main/java/docs/ddata/protobuf/msg/TwoPhaseSetMessages.java
@@ -14,6 +14,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: TwoPhaseSetMessages.proto
 
+// Protobuf Java Version: 3.25.6
 package docs.ddata.protobuf.msg;
 
 public final class TwoPhaseSetMessages {
@@ -84,7 +85,7 @@ public interface TwoPhaseSetOrBuilder extends
   /**
    * Protobuf type {@code docs.ddata.TwoPhaseSet}
    */
-  public  static final class TwoPhaseSet extends
+  public static final class TwoPhaseSet extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:docs.ddata.TwoPhaseSet)
       TwoPhaseSetOrBuilder {
@@ -94,8 +95,10 @@ private TwoPhaseSet(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Buil
       super(builder);
     }
     private TwoPhaseSet() {
-      adds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-      removals_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      adds_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      removals_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -105,73 +108,6 @@ protected java.lang.Object newInstance(
       return new TwoPhaseSet();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private TwoPhaseSet(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                adds_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              adds_.add(bs);
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                removals_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              removals_.add(bs);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          adds_ = adds_.getUnmodifiableView();
-        }
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          removals_ = removals_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return docs.ddata.protobuf.msg.TwoPhaseSetMessages.internal_static_docs_ddata_TwoPhaseSet_descriptor;
@@ -186,7 +122,9 @@ private TwoPhaseSet(
     }
 
     public static final int ADDS_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.LazyStringList adds_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList adds_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string adds = 1;
      * @return A list containing the adds.
@@ -221,7 +159,9 @@ public java.lang.String getAdds(int index) {
     }
 
     public static final int REMOVALS_FIELD_NUMBER = 2;
-    private org.apache.pekko.protobufv3.internal.LazyStringList removals_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList removals_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string removals = 2;
      * @return A list containing the removals.
@@ -275,7 +215,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < removals_.size(); i++) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, removals_.getRaw(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -300,7 +240,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getRemovalsList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -319,7 +259,7 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getAddsList())) return false;
       if (!getRemovalsList()
           .equals(other.getRemovalsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -338,7 +278,7 @@ public int hashCode() {
         hash = (37 * hash) + REMOVALS_FIELD_NUMBER;
         hash = (53 * hash) + getRemovalsList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -387,11 +327,13 @@ public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -455,26 +397,22 @@ public static final class Builder extends
 
       // Construct using docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        adds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        removals_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = 0;
+        adds_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        removals_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         return this;
       }
 
@@ -501,19 +439,21 @@ public docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet build() {
       @java.lang.Override
       public docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet buildPartial() {
         docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet result = new docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet result) {
         int from_bitField0_ = bitField0_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          adds_ = adds_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000001);
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          adds_.makeImmutable();
+          result.adds_ = adds_;
         }
-        result.adds_ = adds_;
-        if (((bitField0_ & 0x00000002) != 0)) {
-          removals_ = removals_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000002);
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          removals_.makeImmutable();
+          result.removals_ = removals_;
         }
-        result.removals_ = removals_;
-        onBuilt();
-        return result;
       }
 
       @java.lang.Override
@@ -563,7 +503,7 @@ public Builder mergeFrom(docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet
         if (!other.adds_.isEmpty()) {
           if (adds_.isEmpty()) {
             adds_ = other.adds_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ |= 0x00000001;
           } else {
             ensureAddsIsMutable();
             adds_.addAll(other.adds_);
@@ -573,14 +513,14 @@ public Builder mergeFrom(docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet
         if (!other.removals_.isEmpty()) {
           if (removals_.isEmpty()) {
             removals_ = other.removals_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ |= 0x00000002;
           } else {
             ensureRemovalsIsMutable();
             removals_.addAll(other.removals_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -595,27 +535,53 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureAddsIsMutable();
+                adds_.add(bs);
+                break;
+              } // case 10
+              case 18: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureRemovalsIsMutable();
+                removals_.add(bs);
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList adds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList adds_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureAddsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!adds_.isModifiable()) {
           adds_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(adds_);
-          bitField0_ |= 0x00000001;
-         }
+        }
+        bitField0_ |= 0x00000001;
       }
       /**
        * repeated string adds = 1;
@@ -623,7 +589,8 @@ private void ensureAddsIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getAddsList() {
-        return adds_.getUnmodifiableView();
+        adds_.makeImmutable();
+        return adds_;
       }
       /**
        * repeated string adds = 1;
@@ -657,11 +624,10 @@ public java.lang.String getAdds(int index) {
        */
       public Builder setAdds(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureAddsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureAddsIsMutable();
         adds_.set(index, value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -672,11 +638,10 @@ public Builder setAdds(
        */
       public Builder addAdds(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureAddsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureAddsIsMutable();
         adds_.add(value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -690,6 +655,7 @@ public Builder addAllAdds(
         ensureAddsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, adds_);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -698,8 +664,9 @@ public Builder addAllAdds(
        * @return This builder for chaining.
        */
       public Builder clearAdds() {
-        adds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        adds_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);;
         onChanged();
         return this;
       }
@@ -710,21 +677,21 @@ public Builder clearAdds() {
        */
       public Builder addAddsBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureAddsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureAddsIsMutable();
         adds_.add(value);
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList removals_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList removals_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureRemovalsIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!removals_.isModifiable()) {
           removals_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(removals_);
-          bitField0_ |= 0x00000002;
-         }
+        }
+        bitField0_ |= 0x00000002;
       }
       /**
        * repeated string removals = 2;
@@ -732,7 +699,8 @@ private void ensureRemovalsIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getRemovalsList() {
-        return removals_.getUnmodifiableView();
+        removals_.makeImmutable();
+        return removals_;
       }
       /**
        * repeated string removals = 2;
@@ -766,11 +734,10 @@ public java.lang.String getRemovals(int index) {
        */
       public Builder setRemovals(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureRemovalsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureRemovalsIsMutable();
         removals_.set(index, value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -781,11 +748,10 @@ public Builder setRemovals(
        */
       public Builder addRemovals(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureRemovalsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureRemovalsIsMutable();
         removals_.add(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -799,6 +765,7 @@ public Builder addAllRemovals(
         ensureRemovalsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, removals_);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -807,8 +774,9 @@ public Builder addAllRemovals(
        * @return This builder for chaining.
        */
       public Builder clearRemovals() {
-        removals_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        removals_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);;
         onChanged();
         return this;
       }
@@ -819,11 +787,10 @@ public Builder clearRemovals() {
        */
       public Builder addRemovalsBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureRemovalsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureRemovalsIsMutable();
         removals_.add(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -860,7 +827,18 @@ public TwoPhaseSet parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new TwoPhaseSet(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -913,7 +891,7 @@ public interface TwoPhaseSet2OrBuilder extends
    *
    * Protobuf type {@code docs.ddata.TwoPhaseSet2}
    */
-  public  static final class TwoPhaseSet2 extends
+  public static final class TwoPhaseSet2 extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:docs.ddata.TwoPhaseSet2)
       TwoPhaseSet2OrBuilder {
@@ -934,59 +912,6 @@ protected java.lang.Object newInstance(
       return new TwoPhaseSet2();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private TwoPhaseSet2(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              bitField0_ |= 0x00000001;
-              adds_ = input.readBytes();
-              break;
-            }
-            case 18: {
-              bitField0_ |= 0x00000002;
-              removals_ = input.readBytes();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return docs.ddata.protobuf.msg.TwoPhaseSetMessages.internal_static_docs_ddata_TwoPhaseSet2_descriptor;
@@ -1002,11 +927,12 @@ private TwoPhaseSet2(
 
     private int bitField0_;
     public static final int ADDS_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.ByteString adds_;
+    private org.apache.pekko.protobufv3.internal.ByteString adds_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * optional bytes adds = 1;
      * @return Whether the adds field is set.
      */
+    @java.lang.Override
     public boolean hasAdds() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -1014,16 +940,18 @@ public boolean hasAdds() {
      * optional bytes adds = 1;
      * @return The adds.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getAdds() {
       return adds_;
     }
 
     public static final int REMOVALS_FIELD_NUMBER = 2;
-    private org.apache.pekko.protobufv3.internal.ByteString removals_;
+    private org.apache.pekko.protobufv3.internal.ByteString removals_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * optional bytes removals = 2;
      * @return Whether the removals field is set.
      */
+    @java.lang.Override
     public boolean hasRemovals() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -1031,6 +959,7 @@ public boolean hasRemovals() {
      * optional bytes removals = 2;
      * @return The removals.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getRemovals() {
       return removals_;
     }
@@ -1055,7 +984,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeBytes(2, removals_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -1072,7 +1001,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(2, removals_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1097,7 +1026,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getRemovals()
             .equals(other.getRemovals())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1116,7 +1045,7 @@ public int hashCode() {
         hash = (37 * hash) + REMOVALS_FIELD_NUMBER;
         hash = (53 * hash) + getRemovals().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1165,11 +1094,13 @@ public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 parseFrom
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -1237,26 +1168,20 @@ public static final class Builder extends
 
       // Construct using docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         adds_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
         removals_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -1283,19 +1208,23 @@ public docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 build() {
       @java.lang.Override
       public docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 buildPartial() {
         docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 result = new docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.adds_ = adds_;
           to_bitField0_ |= 0x00000001;
         }
-        result.adds_ = adds_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.removals_ = removals_;
           to_bitField0_ |= 0x00000002;
         }
-        result.removals_ = removals_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1348,7 +1277,7 @@ public Builder mergeFrom(docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet
         if (other.hasRemovals()) {
           setRemovals(other.getRemovals());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1363,17 +1292,40 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                adds_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                removals_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -1383,6 +1335,7 @@ public Builder mergeFrom(
        * optional bytes adds = 1;
        * @return Whether the adds field is set.
        */
+      @java.lang.Override
       public boolean hasAdds() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -1390,6 +1343,7 @@ public boolean hasAdds() {
        * optional bytes adds = 1;
        * @return The adds.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getAdds() {
         return adds_;
       }
@@ -1399,11 +1353,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getAdds() {
        * @return This builder for chaining.
        */
       public Builder setAdds(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         adds_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1423,6 +1375,7 @@ public Builder clearAdds() {
        * optional bytes removals = 2;
        * @return Whether the removals field is set.
        */
+      @java.lang.Override
       public boolean hasRemovals() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -1430,6 +1383,7 @@ public boolean hasRemovals() {
        * optional bytes removals = 2;
        * @return The removals.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getRemovals() {
         return removals_;
       }
@@ -1439,11 +1393,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getRemovals() {
        * @return This builder for chaining.
        */
       public Builder setRemovals(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         removals_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1490,7 +1442,18 @@ public TwoPhaseSet2 parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new TwoPhaseSet2(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
diff --git a/docs/src/main/java/docs/persistence/proto/FlightAppModels.java b/docs/src/main/java/docs/persistence/proto/FlightAppModels.java
index d4f46265df7..c6bb659a4b3 100644
--- a/docs/src/main/java/docs/persistence/proto/FlightAppModels.java
+++ b/docs/src/main/java/docs/persistence/proto/FlightAppModels.java
@@ -14,6 +14,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: FlightAppModels.proto
 
+// Protobuf Java Version: 3.25.6
 package docs.persistence.proto;
 
 public final class FlightAppModels {
@@ -91,7 +92,7 @@ public interface SeatReservedOrBuilder extends
   /**
    * Protobuf type {@code docs.persistence.SeatReserved}
    */
-  public  static final class SeatReserved extends
+  public static final class SeatReserved extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:docs.persistence.SeatReserved)
       SeatReservedOrBuilder {
@@ -112,66 +113,6 @@ protected java.lang.Object newInstance(
       return new SeatReserved();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private SeatReserved(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              letter_ = bs;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              row_ = input.readUInt32();
-              break;
-            }
-            case 26: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000004;
-              seatType_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return docs.persistence.proto.FlightAppModels.internal_static_docs_persistence_SeatReserved_descriptor;
@@ -187,11 +128,13 @@ private SeatReserved(
 
     private int bitField0_;
     public static final int LETTER_FIELD_NUMBER = 1;
-    private volatile java.lang.Object letter_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object letter_ = "";
     /**
      * required string letter = 1;
      * @return Whether the letter field is set.
      */
+    @java.lang.Override
     public boolean hasLetter() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -199,6 +142,7 @@ public boolean hasLetter() {
      * required string letter = 1;
      * @return The letter.
      */
+    @java.lang.Override
     public java.lang.String getLetter() {
       java.lang.Object ref = letter_;
       if (ref instanceof java.lang.String) {
@@ -217,6 +161,7 @@ public java.lang.String getLetter() {
      * required string letter = 1;
      * @return The bytes for letter.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getLetterBytes() {
       java.lang.Object ref = letter_;
@@ -232,11 +177,12 @@ public java.lang.String getLetter() {
     }
 
     public static final int ROW_FIELD_NUMBER = 2;
-    private int row_;
+    private int row_ = 0;
     /**
      * required uint32 row = 2;
      * @return Whether the row field is set.
      */
+    @java.lang.Override
     public boolean hasRow() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -244,12 +190,14 @@ public boolean hasRow() {
      * required uint32 row = 2;
      * @return The row.
      */
+    @java.lang.Override
     public int getRow() {
       return row_;
     }
 
     public static final int SEATTYPE_FIELD_NUMBER = 3;
-    private volatile java.lang.Object seatType_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object seatType_ = "";
     /**
      * 
      * the new field
@@ -258,6 +206,7 @@ public int getRow() {
      * optional string seatType = 3;
      * @return Whether the seatType field is set.
      */
+    @java.lang.Override
     public boolean hasSeatType() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -269,6 +218,7 @@ public boolean hasSeatType() {
      * optional string seatType = 3;
      * @return The seatType.
      */
+    @java.lang.Override
     public java.lang.String getSeatType() {
       java.lang.Object ref = seatType_;
       if (ref instanceof java.lang.String) {
@@ -291,6 +241,7 @@ public java.lang.String getSeatType() {
      * optional string seatType = 3;
      * @return The bytes for seatType.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getSeatTypeBytes() {
       java.lang.Object ref = seatType_;
@@ -336,7 +287,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, seatType_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -355,7 +306,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000004) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(3, seatType_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -385,7 +336,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getSeatType()
             .equals(other.getSeatType())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -408,7 +359,7 @@ public int hashCode() {
         hash = (37 * hash) + SEATTYPE_FIELD_NUMBER;
         hash = (53 * hash) + getSeatType().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -457,11 +408,13 @@ public static docs.persistence.proto.FlightAppModels.SeatReserved parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static docs.persistence.proto.FlightAppModels.SeatReserved parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static docs.persistence.proto.FlightAppModels.SeatReserved parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -525,28 +478,21 @@ public static final class Builder extends
 
       // Construct using docs.persistence.proto.FlightAppModels.SeatReserved.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         letter_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         row_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         seatType_ = "";
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -573,23 +519,27 @@ public docs.persistence.proto.FlightAppModels.SeatReserved build() {
       @java.lang.Override
       public docs.persistence.proto.FlightAppModels.SeatReserved buildPartial() {
         docs.persistence.proto.FlightAppModels.SeatReserved result = new docs.persistence.proto.FlightAppModels.SeatReserved(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(docs.persistence.proto.FlightAppModels.SeatReserved result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.letter_ = letter_;
           to_bitField0_ |= 0x00000001;
         }
-        result.letter_ = letter_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.row_ = row_;
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.seatType_ = seatType_;
           to_bitField0_ |= 0x00000004;
         }
-        result.seatType_ = seatType_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -637,19 +587,19 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(docs.persistence.proto.FlightAppModels.SeatReserved other) {
         if (other == docs.persistence.proto.FlightAppModels.SeatReserved.getDefaultInstance()) return this;
         if (other.hasLetter()) {
-          bitField0_ |= 0x00000001;
           letter_ = other.letter_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasRow()) {
           setRow(other.getRow());
         }
         if (other.hasSeatType()) {
-          bitField0_ |= 0x00000004;
           seatType_ = other.seatType_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -670,17 +620,45 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        docs.persistence.proto.FlightAppModels.SeatReserved parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                letter_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                row_ = input.readUInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 26: {
+                seatType_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (docs.persistence.proto.FlightAppModels.SeatReserved) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -735,11 +713,9 @@ public java.lang.String getLetter() {
        */
       public Builder setLetter(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         letter_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -748,8 +724,8 @@ public Builder setLetter(
        * @return This builder for chaining.
        */
       public Builder clearLetter() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         letter_ = getDefaultInstance().getLetter();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -760,11 +736,9 @@ public Builder clearLetter() {
        */
       public Builder setLetterBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         letter_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -774,6 +748,7 @@ public Builder setLetterBytes(
        * required uint32 row = 2;
        * @return Whether the row field is set.
        */
+      @java.lang.Override
       public boolean hasRow() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -781,6 +756,7 @@ public boolean hasRow() {
        * required uint32 row = 2;
        * @return The row.
        */
+      @java.lang.Override
       public int getRow() {
         return row_;
       }
@@ -790,8 +766,9 @@ public int getRow() {
        * @return This builder for chaining.
        */
       public Builder setRow(int value) {
-        bitField0_ |= 0x00000002;
+
         row_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -872,11 +849,9 @@ public java.lang.String getSeatType() {
        */
       public Builder setSeatType(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         seatType_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -889,8 +864,8 @@ public Builder setSeatType(
        * @return This builder for chaining.
        */
       public Builder clearSeatType() {
-        bitField0_ = (bitField0_ & ~0x00000004);
         seatType_ = getDefaultInstance().getSeatType();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -905,11 +880,9 @@ public Builder clearSeatType() {
        */
       public Builder setSeatTypeBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         seatType_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -946,7 +919,18 @@ public SeatReserved parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new SeatReserved(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
diff --git a/multi-node-testkit/src/main/java/org/apache/pekko/remote/testconductor/TestConductorProtocol.java b/multi-node-testkit/src/main/java/org/apache/pekko/remote/testconductor/TestConductorProtocol.java
index 7ab4fa28dc0..db2eb0c40ea 100644
--- a/multi-node-testkit/src/main/java/org/apache/pekko/remote/testconductor/TestConductorProtocol.java
+++ b/multi-node-testkit/src/main/java/org/apache/pekko/remote/testconductor/TestConductorProtocol.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2020-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: TestConductorProtocol.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.remote.testconductor;
 
 public final class TestConductorProtocol {
@@ -462,7 +463,7 @@ public interface WrapperOrBuilder extends
   /**
    * Protobuf type {@code Wrapper}
    */
-  public  static final class Wrapper extends
+  public static final class Wrapper extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Wrapper)
       WrapperOrBuilder {
@@ -482,107 +483,6 @@ protected java.lang.Object newInstance(
       return new Wrapper();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Wrapper(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = hello_.toBuilder();
-              }
-              hello_ = input.readMessage(org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(hello_);
-                hello_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = barrier_.toBuilder();
-              }
-              barrier_ = input.readMessage(org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(barrier_);
-                barrier_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            case 26: {
-              org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000004) != 0)) {
-                subBuilder = failure_.toBuilder();
-              }
-              failure_ = input.readMessage(org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(failure_);
-                failure_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000004;
-              break;
-            }
-            case 34: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000008;
-              done_ = bs;
-              break;
-            }
-            case 42: {
-              org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000010) != 0)) {
-                subBuilder = addr_.toBuilder();
-              }
-              addr_ = input.readMessage(org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(addr_);
-                addr_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000010;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_Wrapper_descriptor;
@@ -603,6 +503,7 @@ private Wrapper(
      * optional .Hello hello = 1;
      * @return Whether the hello field is set.
      */
+    @java.lang.Override
     public boolean hasHello() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -610,12 +511,14 @@ public boolean hasHello() {
      * optional .Hello hello = 1;
      * @return The hello.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello getHello() {
       return hello_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.getDefaultInstance() : hello_;
     }
     /**
      * optional .Hello hello = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.testconductor.TestConductorProtocol.HelloOrBuilder getHelloOrBuilder() {
       return hello_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.getDefaultInstance() : hello_;
     }
@@ -626,6 +529,7 @@ public org.apache.pekko.remote.testconductor.TestConductorProtocol.HelloOrBuilde
      * optional .EnterBarrier barrier = 2;
      * @return Whether the barrier field is set.
      */
+    @java.lang.Override
     public boolean hasBarrier() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -633,12 +537,14 @@ public boolean hasBarrier() {
      * optional .EnterBarrier barrier = 2;
      * @return The barrier.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier getBarrier() {
       return barrier_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.getDefaultInstance() : barrier_;
     }
     /**
      * optional .EnterBarrier barrier = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrierOrBuilder getBarrierOrBuilder() {
       return barrier_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.getDefaultInstance() : barrier_;
     }
@@ -649,6 +555,7 @@ public org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrierO
      * optional .InjectFailure failure = 3;
      * @return Whether the failure field is set.
      */
+    @java.lang.Override
     public boolean hasFailure() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -656,22 +563,26 @@ public boolean hasFailure() {
      * optional .InjectFailure failure = 3;
      * @return The failure.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure getFailure() {
       return failure_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.getDefaultInstance() : failure_;
     }
     /**
      * optional .InjectFailure failure = 3;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailureOrBuilder getFailureOrBuilder() {
       return failure_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.getDefaultInstance() : failure_;
     }
 
     public static final int DONE_FIELD_NUMBER = 4;
-    private volatile java.lang.Object done_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object done_ = "";
     /**
      * optional string done = 4;
      * @return Whether the done field is set.
      */
+    @java.lang.Override
     public boolean hasDone() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -679,6 +590,7 @@ public boolean hasDone() {
      * optional string done = 4;
      * @return The done.
      */
+    @java.lang.Override
     public java.lang.String getDone() {
       java.lang.Object ref = done_;
       if (ref instanceof java.lang.String) {
@@ -697,6 +609,7 @@ public java.lang.String getDone() {
      * optional string done = 4;
      * @return The bytes for done.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getDoneBytes() {
       java.lang.Object ref = done_;
@@ -717,6 +630,7 @@ public java.lang.String getDone() {
      * optional .AddressRequest addr = 5;
      * @return Whether the addr field is set.
      */
+    @java.lang.Override
     public boolean hasAddr() {
       return ((bitField0_ & 0x00000010) != 0);
     }
@@ -724,12 +638,14 @@ public boolean hasAddr() {
      * optional .AddressRequest addr = 5;
      * @return The addr.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest getAddr() {
       return addr_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.getDefaultInstance() : addr_;
     }
     /**
      * optional .AddressRequest addr = 5;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequestOrBuilder getAddrOrBuilder() {
       return addr_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.getDefaultInstance() : addr_;
     }
@@ -787,7 +703,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000010) != 0)) {
         output.writeMessage(5, getAddr());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -815,7 +731,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(5, getAddr());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -855,7 +771,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getAddr()
             .equals(other.getAddr())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -886,7 +802,7 @@ public int hashCode() {
         hash = (37 * hash) + ADDR_FIELD_NUMBER;
         hash = (53 * hash) + getAddr().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -935,11 +851,13 @@ public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrappe
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -1023,32 +941,28 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (helloBuilder_ == null) {
-          hello_ = null;
-        } else {
-          helloBuilder_.clear();
+        bitField0_ = 0;
+        hello_ = null;
+        if (helloBuilder_ != null) {
+          helloBuilder_.dispose();
+          helloBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (barrierBuilder_ == null) {
-          barrier_ = null;
-        } else {
-          barrierBuilder_.clear();
+        barrier_ = null;
+        if (barrierBuilder_ != null) {
+          barrierBuilder_.dispose();
+          barrierBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        if (failureBuilder_ == null) {
-          failure_ = null;
-        } else {
-          failureBuilder_.clear();
+        failure_ = null;
+        if (failureBuilder_ != null) {
+          failureBuilder_.dispose();
+          failureBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000004);
         done_ = "";
-        bitField0_ = (bitField0_ & ~0x00000008);
-        if (addrBuilder_ == null) {
-          addr_ = null;
-        } else {
-          addrBuilder_.clear();
+        addr_ = null;
+        if (addrBuilder_ != null) {
+          addrBuilder_.dispose();
+          addrBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
@@ -1075,47 +989,43 @@ public org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper build
       @java.lang.Override
       public org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper buildPartial() {
         org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper result = new org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (helloBuilder_ == null) {
-            result.hello_ = hello_;
-          } else {
-            result.hello_ = helloBuilder_.build();
-          }
+          result.hello_ = helloBuilder_ == null
+              ? hello_
+              : helloBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (barrierBuilder_ == null) {
-            result.barrier_ = barrier_;
-          } else {
-            result.barrier_ = barrierBuilder_.build();
-          }
+          result.barrier_ = barrierBuilder_ == null
+              ? barrier_
+              : barrierBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
-          if (failureBuilder_ == null) {
-            result.failure_ = failure_;
-          } else {
-            result.failure_ = failureBuilder_.build();
-          }
+          result.failure_ = failureBuilder_ == null
+              ? failure_
+              : failureBuilder_.build();
           to_bitField0_ |= 0x00000004;
         }
         if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.done_ = done_;
           to_bitField0_ |= 0x00000008;
         }
-        result.done_ = done_;
         if (((from_bitField0_ & 0x00000010) != 0)) {
-          if (addrBuilder_ == null) {
-            result.addr_ = addr_;
-          } else {
-            result.addr_ = addrBuilder_.build();
-          }
+          result.addr_ = addrBuilder_ == null
+              ? addr_
+              : addrBuilder_.build();
           to_bitField0_ |= 0x00000010;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1172,14 +1082,14 @@ public Builder mergeFrom(org.apache.pekko.remote.testconductor.TestConductorProt
           mergeFailure(other.getFailure());
         }
         if (other.hasDone()) {
-          bitField0_ |= 0x00000008;
           done_ = other.done_;
+          bitField0_ |= 0x00000008;
           onChanged();
         }
         if (other.hasAddr()) {
           mergeAddr(other.getAddr());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1214,17 +1124,63 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getHelloFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getBarrierFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 26: {
+                input.readMessage(
+                    getFailureFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              case 34: {
+                done_ = input.readBytes();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 34
+              case 42: {
+                input.readMessage(
+                    getAddrFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 42
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -1259,11 +1215,11 @@ public Builder setHello(org.apache.pekko.remote.testconductor.TestConductorProto
             throw new NullPointerException();
           }
           hello_ = value;
-          onChanged();
         } else {
           helloBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1273,11 +1229,11 @@ public Builder setHello(
           org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.Builder builderForValue) {
         if (helloBuilder_ == null) {
           hello_ = builderForValue.build();
-          onChanged();
         } else {
           helloBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1286,31 +1242,32 @@ public Builder setHello(
       public Builder mergeHello(org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello value) {
         if (helloBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              hello_ != null &&
-              hello_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.getDefaultInstance()) {
-            hello_ =
-              org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.newBuilder(hello_).mergeFrom(value).buildPartial();
+            hello_ != null &&
+            hello_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.getDefaultInstance()) {
+            getHelloBuilder().mergeFrom(value);
           } else {
             hello_ = value;
           }
-          onChanged();
         } else {
           helloBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (hello_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .Hello hello = 1;
        */
       public Builder clearHello() {
-        if (helloBuilder_ == null) {
-          hello_ = null;
-          onChanged();
-        } else {
-          helloBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        hello_ = null;
+        if (helloBuilder_ != null) {
+          helloBuilder_.dispose();
+          helloBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -1379,11 +1336,11 @@ public Builder setBarrier(org.apache.pekko.remote.testconductor.TestConductorPro
             throw new NullPointerException();
           }
           barrier_ = value;
-          onChanged();
         } else {
           barrierBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -1393,11 +1350,11 @@ public Builder setBarrier(
           org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.Builder builderForValue) {
         if (barrierBuilder_ == null) {
           barrier_ = builderForValue.build();
-          onChanged();
         } else {
           barrierBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -1406,31 +1363,32 @@ public Builder setBarrier(
       public Builder mergeBarrier(org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier value) {
         if (barrierBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              barrier_ != null &&
-              barrier_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.getDefaultInstance()) {
-            barrier_ =
-              org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.newBuilder(barrier_).mergeFrom(value).buildPartial();
+            barrier_ != null &&
+            barrier_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.getDefaultInstance()) {
+            getBarrierBuilder().mergeFrom(value);
           } else {
             barrier_ = value;
           }
-          onChanged();
         } else {
           barrierBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (barrier_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .EnterBarrier barrier = 2;
        */
       public Builder clearBarrier() {
-        if (barrierBuilder_ == null) {
-          barrier_ = null;
-          onChanged();
-        } else {
-          barrierBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        barrier_ = null;
+        if (barrierBuilder_ != null) {
+          barrierBuilder_.dispose();
+          barrierBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -1499,11 +1457,11 @@ public Builder setFailure(org.apache.pekko.remote.testconductor.TestConductorPro
             throw new NullPointerException();
           }
           failure_ = value;
-          onChanged();
         } else {
           failureBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -1513,11 +1471,11 @@ public Builder setFailure(
           org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.Builder builderForValue) {
         if (failureBuilder_ == null) {
           failure_ = builderForValue.build();
-          onChanged();
         } else {
           failureBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -1526,31 +1484,32 @@ public Builder setFailure(
       public Builder mergeFailure(org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure value) {
         if (failureBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
-              failure_ != null &&
-              failure_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.getDefaultInstance()) {
-            failure_ =
-              org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.newBuilder(failure_).mergeFrom(value).buildPartial();
+            failure_ != null &&
+            failure_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.getDefaultInstance()) {
+            getFailureBuilder().mergeFrom(value);
           } else {
             failure_ = value;
           }
-          onChanged();
         } else {
           failureBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000004;
+        if (failure_ != null) {
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .InjectFailure failure = 3;
        */
       public Builder clearFailure() {
-        if (failureBuilder_ == null) {
-          failure_ = null;
-          onChanged();
-        } else {
-          failureBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000004);
+        failure_ = null;
+        if (failureBuilder_ != null) {
+          failureBuilder_.dispose();
+          failureBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -1639,11 +1598,9 @@ public java.lang.String getDone() {
        */
       public Builder setDone(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
+        if (value == null) { throw new NullPointerException(); }
         done_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -1652,8 +1609,8 @@ public Builder setDone(
        * @return This builder for chaining.
        */
       public Builder clearDone() {
-        bitField0_ = (bitField0_ & ~0x00000008);
         done_ = getDefaultInstance().getDone();
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
@@ -1664,11 +1621,9 @@ public Builder clearDone() {
        */
       public Builder setDoneBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
+        if (value == null) { throw new NullPointerException(); }
         done_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -1703,11 +1658,11 @@ public Builder setAddr(org.apache.pekko.remote.testconductor.TestConductorProtoc
             throw new NullPointerException();
           }
           addr_ = value;
-          onChanged();
         } else {
           addrBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /**
@@ -1717,11 +1672,11 @@ public Builder setAddr(
           org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.Builder builderForValue) {
         if (addrBuilder_ == null) {
           addr_ = builderForValue.build();
-          onChanged();
         } else {
           addrBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /**
@@ -1730,31 +1685,32 @@ public Builder setAddr(
       public Builder mergeAddr(org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest value) {
         if (addrBuilder_ == null) {
           if (((bitField0_ & 0x00000010) != 0) &&
-              addr_ != null &&
-              addr_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.getDefaultInstance()) {
-            addr_ =
-              org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.newBuilder(addr_).mergeFrom(value).buildPartial();
+            addr_ != null &&
+            addr_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.getDefaultInstance()) {
+            getAddrBuilder().mergeFrom(value);
           } else {
             addr_ = value;
           }
-          onChanged();
         } else {
           addrBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000010;
+        if (addr_ != null) {
+          bitField0_ |= 0x00000010;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .AddressRequest addr = 5;
        */
       public Builder clearAddr() {
-        if (addrBuilder_ == null) {
-          addr_ = null;
-          onChanged();
-        } else {
-          addrBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000010);
+        addr_ = null;
+        if (addrBuilder_ != null) {
+          addrBuilder_.dispose();
+          addrBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -1825,7 +1781,18 @@ public Wrapper parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Wrapper(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -1884,7 +1851,7 @@ public interface HelloOrBuilder extends
   /**
    * Protobuf type {@code Hello}
    */
-  public  static final class Hello extends
+  public static final class Hello extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Hello)
       HelloOrBuilder {
@@ -1904,68 +1871,6 @@ protected java.lang.Object newInstance(
       return new Hello();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Hello(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              name_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = address_.toBuilder();
-              }
-              address_ = input.readMessage(org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(address_);
-                address_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_Hello_descriptor;
@@ -1981,11 +1886,13 @@ private Hello(
 
     private int bitField0_;
     public static final int NAME_FIELD_NUMBER = 1;
-    private volatile java.lang.Object name_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object name_ = "";
     /**
      * required string name = 1;
      * @return Whether the name field is set.
      */
+    @java.lang.Override
     public boolean hasName() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -1993,6 +1900,7 @@ public boolean hasName() {
      * required string name = 1;
      * @return The name.
      */
+    @java.lang.Override
     public java.lang.String getName() {
       java.lang.Object ref = name_;
       if (ref instanceof java.lang.String) {
@@ -2011,6 +1919,7 @@ public java.lang.String getName() {
      * required string name = 1;
      * @return The bytes for name.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getNameBytes() {
       java.lang.Object ref = name_;
@@ -2031,6 +1940,7 @@ public java.lang.String getName() {
      * required .Address address = 2;
      * @return Whether the address field is set.
      */
+    @java.lang.Override
     public boolean hasAddress() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -2038,12 +1948,14 @@ public boolean hasAddress() {
      * required .Address address = 2;
      * @return The address.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.testconductor.TestConductorProtocol.Address getAddress() {
       return address_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : address_;
     }
     /**
      * required .Address address = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddressOrBuilder() {
       return address_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : address_;
     }
@@ -2080,7 +1992,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getAddress());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -2096,7 +2008,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getAddress());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2121,7 +2033,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getAddress()
             .equals(other.getAddress())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -2140,7 +2052,7 @@ public int hashCode() {
         hash = (37 * hash) + ADDRESS_FIELD_NUMBER;
         hash = (53 * hash) + getAddress().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -2189,11 +2101,13 @@ public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -2274,14 +2188,13 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         name_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (addressBuilder_ == null) {
-          address_ = null;
-        } else {
-          addressBuilder_.clear();
+        address_ = null;
+        if (addressBuilder_ != null) {
+          addressBuilder_.dispose();
+          addressBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -2308,23 +2221,25 @@ public org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello build()
       @java.lang.Override
       public org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello buildPartial() {
         org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello result = new org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.name_ = name_;
           to_bitField0_ |= 0x00000001;
         }
-        result.name_ = name_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (addressBuilder_ == null) {
-            result.address_ = address_;
-          } else {
-            result.address_ = addressBuilder_.build();
-          }
+          result.address_ = addressBuilder_ == null
+              ? address_
+              : addressBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -2372,14 +2287,14 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello other) {
         if (other == org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.getDefaultInstance()) return this;
         if (other.hasName()) {
-          bitField0_ |= 0x00000001;
           name_ = other.name_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasAddress()) {
           mergeAddress(other.getAddress());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -2403,17 +2318,42 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                name_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getAddressFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -2468,11 +2408,9 @@ public java.lang.String getName() {
        */
       public Builder setName(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         name_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2481,8 +2419,8 @@ public Builder setName(
        * @return This builder for chaining.
        */
       public Builder clearName() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         name_ = getDefaultInstance().getName();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -2493,11 +2431,9 @@ public Builder clearName() {
        */
       public Builder setNameBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         name_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2532,11 +2468,11 @@ public Builder setAddress(org.apache.pekko.remote.testconductor.TestConductorPro
             throw new NullPointerException();
           }
           address_ = value;
-          onChanged();
         } else {
           addressBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -2546,11 +2482,11 @@ public Builder setAddress(
           org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder builderForValue) {
         if (addressBuilder_ == null) {
           address_ = builderForValue.build();
-          onChanged();
         } else {
           addressBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -2559,31 +2495,32 @@ public Builder setAddress(
       public Builder mergeAddress(org.apache.pekko.remote.testconductor.TestConductorProtocol.Address value) {
         if (addressBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              address_ != null &&
-              address_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance()) {
-            address_ =
-              org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.newBuilder(address_).mergeFrom(value).buildPartial();
+            address_ != null &&
+            address_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance()) {
+            getAddressBuilder().mergeFrom(value);
           } else {
             address_ = value;
           }
-          onChanged();
         } else {
           addressBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (address_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Address address = 2;
        */
       public Builder clearAddress() {
-        if (addressBuilder_ == null) {
-          address_ = null;
-          onChanged();
-        } else {
-          addressBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        address_ = null;
+        if (addressBuilder_ != null) {
+          addressBuilder_.dispose();
+          addressBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -2654,7 +2591,18 @@ public Hello parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Hello(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -2720,7 +2668,7 @@ public interface EnterBarrierOrBuilder extends
   /**
    * Protobuf type {@code EnterBarrier}
    */
-  public  static final class EnterBarrier extends
+  public static final class EnterBarrier extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:EnterBarrier)
       EnterBarrierOrBuilder {
@@ -2741,72 +2689,6 @@ protected java.lang.Object newInstance(
       return new EnterBarrier();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private EnterBarrier(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              name_ = bs;
-              break;
-            }
-            case 16: {
-              int rawValue = input.readEnum();
-                @SuppressWarnings("deprecation")
-              org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp value = org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(2, rawValue);
-              } else {
-                bitField0_ |= 0x00000002;
-                op_ = rawValue;
-              }
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              timeout_ = input.readInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_EnterBarrier_descriptor;
@@ -2822,11 +2704,13 @@ private EnterBarrier(
 
     private int bitField0_;
     public static final int NAME_FIELD_NUMBER = 1;
-    private volatile java.lang.Object name_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object name_ = "";
     /**
      * required string name = 1;
      * @return Whether the name field is set.
      */
+    @java.lang.Override
     public boolean hasName() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -2834,6 +2718,7 @@ public boolean hasName() {
      * required string name = 1;
      * @return The name.
      */
+    @java.lang.Override
     public java.lang.String getName() {
       java.lang.Object ref = name_;
       if (ref instanceof java.lang.String) {
@@ -2852,6 +2737,7 @@ public java.lang.String getName() {
      * required string name = 1;
      * @return The bytes for name.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getNameBytes() {
       java.lang.Object ref = name_;
@@ -2867,30 +2753,30 @@ public java.lang.String getName() {
     }
 
     public static final int OP_FIELD_NUMBER = 2;
-    private int op_;
+    private int op_ = 1;
     /**
      * required .BarrierOp op = 2;
      * @return Whether the op field is set.
      */
-    public boolean hasOp() {
+    @java.lang.Override public boolean hasOp() {
       return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      * required .BarrierOp op = 2;
      * @return The op.
      */
-    public org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp getOp() {
-      @SuppressWarnings("deprecation")
-      org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp result = org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp.valueOf(op_);
+    @java.lang.Override public org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp getOp() {
+      org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp result = org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp.forNumber(op_);
       return result == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp.Enter : result;
     }
 
     public static final int TIMEOUT_FIELD_NUMBER = 3;
-    private long timeout_;
+    private long timeout_ = 0L;
     /**
      * optional int64 timeout = 3;
      * @return Whether the timeout field is set.
      */
+    @java.lang.Override
     public boolean hasTimeout() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -2898,6 +2784,7 @@ public boolean hasTimeout() {
      * optional int64 timeout = 3;
      * @return The timeout.
      */
+    @java.lang.Override
     public long getTimeout() {
       return timeout_;
     }
@@ -2933,7 +2820,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeInt64(3, timeout_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -2953,7 +2840,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(3, timeout_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2982,7 +2869,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getTimeout()
             != other.getTimeout()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -3006,7 +2893,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getTimeout());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3055,11 +2942,13 @@ public static org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterB
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -3123,28 +3012,21 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         name_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         op_ = 1;
-        bitField0_ = (bitField0_ & ~0x00000002);
         timeout_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -3171,23 +3053,27 @@ public org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier
       @java.lang.Override
       public org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier buildPartial() {
         org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier result = new org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.name_ = name_;
           to_bitField0_ |= 0x00000001;
         }
-        result.name_ = name_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.op_ = op_;
           to_bitField0_ |= 0x00000002;
         }
-        result.op_ = op_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.timeout_ = timeout_;
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -3235,8 +3121,8 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier other) {
         if (other == org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.getDefaultInstance()) return this;
         if (other.hasName()) {
-          bitField0_ |= 0x00000001;
           name_ = other.name_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasOp()) {
@@ -3245,7 +3131,7 @@ public Builder mergeFrom(org.apache.pekko.remote.testconductor.TestConductorProt
         if (other.hasTimeout()) {
           setTimeout(other.getTimeout());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -3266,17 +3152,52 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                name_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                int tmpRaw = input.readEnum();
+                org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp tmpValue =
+                    org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(2, tmpRaw);
+                } else {
+                  op_ = tmpRaw;
+                  bitField0_ |= 0x00000002;
+                }
+                break;
+              } // case 16
+              case 24: {
+                timeout_ = input.readInt64();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -3331,11 +3252,9 @@ public java.lang.String getName() {
        */
       public Builder setName(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         name_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -3344,8 +3263,8 @@ public Builder setName(
        * @return This builder for chaining.
        */
       public Builder clearName() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         name_ = getDefaultInstance().getName();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -3356,11 +3275,9 @@ public Builder clearName() {
        */
       public Builder setNameBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         name_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -3370,16 +3287,16 @@ public Builder setNameBytes(
        * required .BarrierOp op = 2;
        * @return Whether the op field is set.
        */
-      public boolean hasOp() {
+      @java.lang.Override public boolean hasOp() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
        * required .BarrierOp op = 2;
        * @return The op.
        */
+      @java.lang.Override
       public org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp getOp() {
-        @SuppressWarnings("deprecation")
-        org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp result = org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp.valueOf(op_);
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp result = org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp.forNumber(op_);
         return result == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp.Enter : result;
       }
       /**
@@ -3412,6 +3329,7 @@ public Builder clearOp() {
        * optional int64 timeout = 3;
        * @return Whether the timeout field is set.
        */
+      @java.lang.Override
       public boolean hasTimeout() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -3419,6 +3337,7 @@ public boolean hasTimeout() {
        * optional int64 timeout = 3;
        * @return The timeout.
        */
+      @java.lang.Override
       public long getTimeout() {
         return timeout_;
       }
@@ -3428,8 +3347,9 @@ public long getTimeout() {
        * @return This builder for chaining.
        */
       public Builder setTimeout(long value) {
-        bitField0_ |= 0x00000004;
+
         timeout_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -3476,7 +3396,18 @@ public EnterBarrier parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new EnterBarrier(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -3535,7 +3466,7 @@ public interface AddressRequestOrBuilder extends
   /**
    * Protobuf type {@code AddressRequest}
    */
-  public  static final class AddressRequest extends
+  public static final class AddressRequest extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:AddressRequest)
       AddressRequestOrBuilder {
@@ -3555,68 +3486,6 @@ protected java.lang.Object newInstance(
       return new AddressRequest();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private AddressRequest(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              node_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = addr_.toBuilder();
-              }
-              addr_ = input.readMessage(org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(addr_);
-                addr_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_AddressRequest_descriptor;
@@ -3632,11 +3501,13 @@ private AddressRequest(
 
     private int bitField0_;
     public static final int NODE_FIELD_NUMBER = 1;
-    private volatile java.lang.Object node_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object node_ = "";
     /**
      * required string node = 1;
      * @return Whether the node field is set.
      */
+    @java.lang.Override
     public boolean hasNode() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -3644,6 +3515,7 @@ public boolean hasNode() {
      * required string node = 1;
      * @return The node.
      */
+    @java.lang.Override
     public java.lang.String getNode() {
       java.lang.Object ref = node_;
       if (ref instanceof java.lang.String) {
@@ -3662,6 +3534,7 @@ public java.lang.String getNode() {
      * required string node = 1;
      * @return The bytes for node.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getNodeBytes() {
       java.lang.Object ref = node_;
@@ -3682,6 +3555,7 @@ public java.lang.String getNode() {
      * optional .Address addr = 2;
      * @return Whether the addr field is set.
      */
+    @java.lang.Override
     public boolean hasAddr() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -3689,12 +3563,14 @@ public boolean hasAddr() {
      * optional .Address addr = 2;
      * @return The addr.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.testconductor.TestConductorProtocol.Address getAddr() {
       return addr_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : addr_;
     }
     /**
      * optional .Address addr = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddrOrBuilder() {
       return addr_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : addr_;
     }
@@ -3729,7 +3605,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getAddr());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -3745,7 +3621,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getAddr());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -3770,7 +3646,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getAddr()
             .equals(other.getAddr())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -3789,7 +3665,7 @@ public int hashCode() {
         hash = (37 * hash) + ADDR_FIELD_NUMBER;
         hash = (53 * hash) + getAddr().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3838,11 +3714,13 @@ public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Addres
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -3923,14 +3801,13 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         node_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (addrBuilder_ == null) {
-          addr_ = null;
-        } else {
-          addrBuilder_.clear();
+        addr_ = null;
+        if (addrBuilder_ != null) {
+          addrBuilder_.dispose();
+          addrBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -3957,23 +3834,25 @@ public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressReques
       @java.lang.Override
       public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest buildPartial() {
         org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest result = new org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.node_ = node_;
           to_bitField0_ |= 0x00000001;
         }
-        result.node_ = node_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (addrBuilder_ == null) {
-            result.addr_ = addr_;
-          } else {
-            result.addr_ = addrBuilder_.build();
-          }
+          result.addr_ = addrBuilder_ == null
+              ? addr_
+              : addrBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -4021,14 +3900,14 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest other) {
         if (other == org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.getDefaultInstance()) return this;
         if (other.hasNode()) {
-          bitField0_ |= 0x00000001;
           node_ = other.node_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasAddr()) {
           mergeAddr(other.getAddr());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -4051,17 +3930,42 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                node_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getAddrFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -4116,11 +4020,9 @@ public java.lang.String getNode() {
        */
       public Builder setNode(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         node_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4129,8 +4031,8 @@ public Builder setNode(
        * @return This builder for chaining.
        */
       public Builder clearNode() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         node_ = getDefaultInstance().getNode();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -4141,11 +4043,9 @@ public Builder clearNode() {
        */
       public Builder setNodeBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         node_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4180,11 +4080,11 @@ public Builder setAddr(org.apache.pekko.remote.testconductor.TestConductorProtoc
             throw new NullPointerException();
           }
           addr_ = value;
-          onChanged();
         } else {
           addrBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -4194,11 +4094,11 @@ public Builder setAddr(
           org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder builderForValue) {
         if (addrBuilder_ == null) {
           addr_ = builderForValue.build();
-          onChanged();
         } else {
           addrBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -4207,31 +4107,32 @@ public Builder setAddr(
       public Builder mergeAddr(org.apache.pekko.remote.testconductor.TestConductorProtocol.Address value) {
         if (addrBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              addr_ != null &&
-              addr_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance()) {
-            addr_ =
-              org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.newBuilder(addr_).mergeFrom(value).buildPartial();
+            addr_ != null &&
+            addr_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance()) {
+            getAddrBuilder().mergeFrom(value);
           } else {
             addr_ = value;
           }
-          onChanged();
         } else {
           addrBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (addr_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .Address addr = 2;
        */
       public Builder clearAddr() {
-        if (addrBuilder_ == null) {
-          addr_ = null;
-          onChanged();
-        } else {
-          addrBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        addr_ = null;
+        if (addrBuilder_ != null) {
+          addrBuilder_.dispose();
+          addrBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -4302,7 +4203,18 @@ public AddressRequest parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new AddressRequest(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -4391,7 +4303,7 @@ public interface AddressOrBuilder extends
   /**
    * Protobuf type {@code Address}
    */
-  public  static final class Address extends
+  public static final class Address extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Address)
       AddressOrBuilder {
@@ -4413,72 +4325,6 @@ protected java.lang.Object newInstance(
       return new Address();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Address(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              protocol_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              system_ = bs;
-              break;
-            }
-            case 26: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000004;
-              host_ = bs;
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              port_ = input.readInt32();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_Address_descriptor;
@@ -4494,11 +4340,13 @@ private Address(
 
     private int bitField0_;
     public static final int PROTOCOL_FIELD_NUMBER = 1;
-    private volatile java.lang.Object protocol_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object protocol_ = "";
     /**
      * required string protocol = 1;
      * @return Whether the protocol field is set.
      */
+    @java.lang.Override
     public boolean hasProtocol() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -4506,6 +4354,7 @@ public boolean hasProtocol() {
      * required string protocol = 1;
      * @return The protocol.
      */
+    @java.lang.Override
     public java.lang.String getProtocol() {
       java.lang.Object ref = protocol_;
       if (ref instanceof java.lang.String) {
@@ -4524,6 +4373,7 @@ public java.lang.String getProtocol() {
      * required string protocol = 1;
      * @return The bytes for protocol.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getProtocolBytes() {
       java.lang.Object ref = protocol_;
@@ -4539,11 +4389,13 @@ public java.lang.String getProtocol() {
     }
 
     public static final int SYSTEM_FIELD_NUMBER = 2;
-    private volatile java.lang.Object system_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object system_ = "";
     /**
      * required string system = 2;
      * @return Whether the system field is set.
      */
+    @java.lang.Override
     public boolean hasSystem() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -4551,6 +4403,7 @@ public boolean hasSystem() {
      * required string system = 2;
      * @return The system.
      */
+    @java.lang.Override
     public java.lang.String getSystem() {
       java.lang.Object ref = system_;
       if (ref instanceof java.lang.String) {
@@ -4569,6 +4422,7 @@ public java.lang.String getSystem() {
      * required string system = 2;
      * @return The bytes for system.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getSystemBytes() {
       java.lang.Object ref = system_;
@@ -4584,11 +4438,13 @@ public java.lang.String getSystem() {
     }
 
     public static final int HOST_FIELD_NUMBER = 3;
-    private volatile java.lang.Object host_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object host_ = "";
     /**
      * required string host = 3;
      * @return Whether the host field is set.
      */
+    @java.lang.Override
     public boolean hasHost() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -4596,6 +4452,7 @@ public boolean hasHost() {
      * required string host = 3;
      * @return The host.
      */
+    @java.lang.Override
     public java.lang.String getHost() {
       java.lang.Object ref = host_;
       if (ref instanceof java.lang.String) {
@@ -4614,6 +4471,7 @@ public java.lang.String getHost() {
      * required string host = 3;
      * @return The bytes for host.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getHostBytes() {
       java.lang.Object ref = host_;
@@ -4629,11 +4487,12 @@ public java.lang.String getHost() {
     }
 
     public static final int PORT_FIELD_NUMBER = 4;
-    private int port_;
+    private int port_ = 0;
     /**
      * required int32 port = 4;
      * @return Whether the port field is set.
      */
+    @java.lang.Override
     public boolean hasPort() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -4641,6 +4500,7 @@ public boolean hasPort() {
      * required int32 port = 4;
      * @return The port.
      */
+    @java.lang.Override
     public int getPort() {
       return port_;
     }
@@ -4687,7 +4547,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeInt32(4, port_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -4709,7 +4569,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(4, port_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4744,7 +4604,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getPort()
             != other.getPort()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -4771,7 +4631,7 @@ public int hashCode() {
         hash = (37 * hash) + PORT_FIELD_NUMBER;
         hash = (53 * hash) + getPort();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4820,11 +4680,13 @@ public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Addres
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Address parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Address parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -4888,30 +4750,22 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         protocol_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         system_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         host_ = "";
-        bitField0_ = (bitField0_ & ~0x00000004);
         port_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -4938,27 +4792,31 @@ public org.apache.pekko.remote.testconductor.TestConductorProtocol.Address build
       @java.lang.Override
       public org.apache.pekko.remote.testconductor.TestConductorProtocol.Address buildPartial() {
         org.apache.pekko.remote.testconductor.TestConductorProtocol.Address result = new org.apache.pekko.remote.testconductor.TestConductorProtocol.Address(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.testconductor.TestConductorProtocol.Address result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.protocol_ = protocol_;
           to_bitField0_ |= 0x00000001;
         }
-        result.protocol_ = protocol_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.system_ = system_;
           to_bitField0_ |= 0x00000002;
         }
-        result.system_ = system_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.host_ = host_;
           to_bitField0_ |= 0x00000004;
         }
-        result.host_ = host_;
         if (((from_bitField0_ & 0x00000008) != 0)) {
           result.port_ = port_;
           to_bitField0_ |= 0x00000008;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -5006,24 +4864,24 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.remote.testconductor.TestConductorProtocol.Address other) {
         if (other == org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance()) return this;
         if (other.hasProtocol()) {
-          bitField0_ |= 0x00000001;
           protocol_ = other.protocol_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasSystem()) {
-          bitField0_ |= 0x00000002;
           system_ = other.system_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasHost()) {
-          bitField0_ |= 0x00000004;
           host_ = other.host_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
         if (other.hasPort()) {
           setPort(other.getPort());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -5050,17 +4908,50 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.testconductor.TestConductorProtocol.Address parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                protocol_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                system_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 26: {
+                host_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              case 32: {
+                port_ = input.readInt32();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.testconductor.TestConductorProtocol.Address) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -5115,11 +5006,9 @@ public java.lang.String getProtocol() {
        */
       public Builder setProtocol(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         protocol_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -5128,8 +5017,8 @@ public Builder setProtocol(
        * @return This builder for chaining.
        */
       public Builder clearProtocol() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         protocol_ = getDefaultInstance().getProtocol();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -5140,11 +5029,9 @@ public Builder clearProtocol() {
        */
       public Builder setProtocolBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         protocol_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -5199,11 +5086,9 @@ public java.lang.String getSystem() {
        */
       public Builder setSystem(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         system_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -5212,8 +5097,8 @@ public Builder setSystem(
        * @return This builder for chaining.
        */
       public Builder clearSystem() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         system_ = getDefaultInstance().getSystem();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -5224,11 +5109,9 @@ public Builder clearSystem() {
        */
       public Builder setSystemBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         system_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -5283,11 +5166,9 @@ public java.lang.String getHost() {
        */
       public Builder setHost(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         host_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -5296,8 +5177,8 @@ public Builder setHost(
        * @return This builder for chaining.
        */
       public Builder clearHost() {
-        bitField0_ = (bitField0_ & ~0x00000004);
         host_ = getDefaultInstance().getHost();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -5308,11 +5189,9 @@ public Builder clearHost() {
        */
       public Builder setHostBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         host_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -5322,6 +5201,7 @@ public Builder setHostBytes(
        * required int32 port = 4;
        * @return Whether the port field is set.
        */
+      @java.lang.Override
       public boolean hasPort() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -5329,6 +5209,7 @@ public boolean hasPort() {
        * required int32 port = 4;
        * @return The port.
        */
+      @java.lang.Override
       public int getPort() {
         return port_;
       }
@@ -5338,8 +5219,9 @@ public int getPort() {
        * @return This builder for chaining.
        */
       public Builder setPort(int value) {
-        bitField0_ |= 0x00000008;
+
         port_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -5386,7 +5268,18 @@ public Address parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Address(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -5472,7 +5365,7 @@ public interface InjectFailureOrBuilder extends
   /**
    * Protobuf type {@code InjectFailure}
    */
-  public  static final class InjectFailure extends
+  public static final class InjectFailure extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:InjectFailure)
       InjectFailureOrBuilder {
@@ -5493,96 +5386,6 @@ protected java.lang.Object newInstance(
       return new InjectFailure();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private InjectFailure(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              int rawValue = input.readEnum();
-                @SuppressWarnings("deprecation")
-              org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType value = org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(1, rawValue);
-              } else {
-                bitField0_ |= 0x00000001;
-                failure_ = rawValue;
-              }
-              break;
-            }
-            case 16: {
-              int rawValue = input.readEnum();
-                @SuppressWarnings("deprecation")
-              org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction value = org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(2, rawValue);
-              } else {
-                bitField0_ |= 0x00000002;
-                direction_ = rawValue;
-              }
-              break;
-            }
-            case 26: {
-              org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000004) != 0)) {
-                subBuilder = address_.toBuilder();
-              }
-              address_ = input.readMessage(org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(address_);
-                address_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000004;
-              break;
-            }
-            case 53: {
-              bitField0_ |= 0x00000008;
-              rateMBit_ = input.readFloat();
-              break;
-            }
-            case 56: {
-              bitField0_ |= 0x00000010;
-              exitValue_ = input.readInt32();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_InjectFailure_descriptor;
@@ -5598,40 +5401,38 @@ private InjectFailure(
 
     private int bitField0_;
     public static final int FAILURE_FIELD_NUMBER = 1;
-    private int failure_;
+    private int failure_ = 1;
     /**
      * required .FailType failure = 1;
      * @return Whether the failure field is set.
      */
-    public boolean hasFailure() {
+    @java.lang.Override public boolean hasFailure() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      * required .FailType failure = 1;
      * @return The failure.
      */
-    public org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType getFailure() {
-      @SuppressWarnings("deprecation")
-      org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType result = org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType.valueOf(failure_);
+    @java.lang.Override public org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType getFailure() {
+      org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType result = org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType.forNumber(failure_);
       return result == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType.Throttle : result;
     }
 
     public static final int DIRECTION_FIELD_NUMBER = 2;
-    private int direction_;
+    private int direction_ = 1;
     /**
      * optional .Direction direction = 2;
      * @return Whether the direction field is set.
      */
-    public boolean hasDirection() {
+    @java.lang.Override public boolean hasDirection() {
       return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      * optional .Direction direction = 2;
      * @return The direction.
      */
-    public org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction getDirection() {
-      @SuppressWarnings("deprecation")
-      org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction result = org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction.valueOf(direction_);
+    @java.lang.Override public org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction getDirection() {
+      org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction result = org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction.forNumber(direction_);
       return result == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction.Send : result;
     }
 
@@ -5641,6 +5442,7 @@ public org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction get
      * optional .Address address = 3;
      * @return Whether the address field is set.
      */
+    @java.lang.Override
     public boolean hasAddress() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -5648,22 +5450,25 @@ public boolean hasAddress() {
      * optional .Address address = 3;
      * @return The address.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.testconductor.TestConductorProtocol.Address getAddress() {
       return address_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : address_;
     }
     /**
      * optional .Address address = 3;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddressOrBuilder() {
       return address_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : address_;
     }
 
     public static final int RATEMBIT_FIELD_NUMBER = 6;
-    private float rateMBit_;
+    private float rateMBit_ = 0F;
     /**
      * optional float rateMBit = 6;
      * @return Whether the rateMBit field is set.
      */
+    @java.lang.Override
     public boolean hasRateMBit() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -5671,16 +5476,18 @@ public boolean hasRateMBit() {
      * optional float rateMBit = 6;
      * @return The rateMBit.
      */
+    @java.lang.Override
     public float getRateMBit() {
       return rateMBit_;
     }
 
     public static final int EXITVALUE_FIELD_NUMBER = 7;
-    private int exitValue_;
+    private int exitValue_ = 0;
     /**
      * optional int32 exitValue = 7;
      * @return Whether the exitValue field is set.
      */
+    @java.lang.Override
     public boolean hasExitValue() {
       return ((bitField0_ & 0x00000010) != 0);
     }
@@ -5688,6 +5495,7 @@ public boolean hasExitValue() {
      * optional int32 exitValue = 7;
      * @return The exitValue.
      */
+    @java.lang.Override
     public int getExitValue() {
       return exitValue_;
     }
@@ -5731,7 +5539,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000010) != 0)) {
         output.writeInt32(7, exitValue_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -5760,7 +5568,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(7, exitValue_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5799,7 +5607,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getExitValue()
             != other.getExitValue()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -5831,7 +5639,7 @@ public int hashCode() {
         hash = (37 * hash) + EXITVALUE_FIELD_NUMBER;
         hash = (53 * hash) + getExitValue();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -5880,11 +5688,13 @@ public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Inject
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -5965,20 +5775,16 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         failure_ = 1;
-        bitField0_ = (bitField0_ & ~0x00000001);
         direction_ = 1;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        if (addressBuilder_ == null) {
-          address_ = null;
-        } else {
-          addressBuilder_.clear();
+        address_ = null;
+        if (addressBuilder_ != null) {
+          addressBuilder_.dispose();
+          addressBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000004);
         rateMBit_ = 0F;
-        bitField0_ = (bitField0_ & ~0x00000008);
         exitValue_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
@@ -6005,22 +5811,26 @@ public org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure
       @java.lang.Override
       public org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure buildPartial() {
         org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure result = new org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.failure_ = failure_;
           to_bitField0_ |= 0x00000001;
         }
-        result.failure_ = failure_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.direction_ = direction_;
           to_bitField0_ |= 0x00000002;
         }
-        result.direction_ = direction_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
-          if (addressBuilder_ == null) {
-            result.address_ = address_;
-          } else {
-            result.address_ = addressBuilder_.build();
-          }
+          result.address_ = addressBuilder_ == null
+              ? address_
+              : addressBuilder_.build();
           to_bitField0_ |= 0x00000004;
         }
         if (((from_bitField0_ & 0x00000008) != 0)) {
@@ -6031,9 +5841,7 @@ public org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure
           result.exitValue_ = exitValue_;
           to_bitField0_ |= 0x00000010;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -6095,7 +5903,7 @@ public Builder mergeFrom(org.apache.pekko.remote.testconductor.TestConductorProt
         if (other.hasExitValue()) {
           setExitValue(other.getExitValue());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -6118,17 +5926,71 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                int tmpRaw = input.readEnum();
+                org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType tmpValue =
+                    org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(1, tmpRaw);
+                } else {
+                  failure_ = tmpRaw;
+                  bitField0_ |= 0x00000001;
+                }
+                break;
+              } // case 8
+              case 16: {
+                int tmpRaw = input.readEnum();
+                org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction tmpValue =
+                    org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(2, tmpRaw);
+                } else {
+                  direction_ = tmpRaw;
+                  bitField0_ |= 0x00000002;
+                }
+                break;
+              } // case 16
+              case 26: {
+                input.readMessage(
+                    getAddressFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              case 53: {
+                rateMBit_ = input.readFloat();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 53
+              case 56: {
+                exitValue_ = input.readInt32();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 56
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -6138,16 +6000,16 @@ public Builder mergeFrom(
        * required .FailType failure = 1;
        * @return Whether the failure field is set.
        */
-      public boolean hasFailure() {
+      @java.lang.Override public boolean hasFailure() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        * required .FailType failure = 1;
        * @return The failure.
        */
+      @java.lang.Override
       public org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType getFailure() {
-        @SuppressWarnings("deprecation")
-        org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType result = org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType.valueOf(failure_);
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType result = org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType.forNumber(failure_);
         return result == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType.Throttle : result;
       }
       /**
@@ -6180,16 +6042,16 @@ public Builder clearFailure() {
        * optional .Direction direction = 2;
        * @return Whether the direction field is set.
        */
-      public boolean hasDirection() {
+      @java.lang.Override public boolean hasDirection() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
        * optional .Direction direction = 2;
        * @return The direction.
        */
+      @java.lang.Override
       public org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction getDirection() {
-        @SuppressWarnings("deprecation")
-        org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction result = org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction.valueOf(direction_);
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction result = org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction.forNumber(direction_);
         return result == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction.Send : result;
       }
       /**
@@ -6247,11 +6109,11 @@ public Builder setAddress(org.apache.pekko.remote.testconductor.TestConductorPro
             throw new NullPointerException();
           }
           address_ = value;
-          onChanged();
         } else {
           addressBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -6261,11 +6123,11 @@ public Builder setAddress(
           org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder builderForValue) {
         if (addressBuilder_ == null) {
           address_ = builderForValue.build();
-          onChanged();
         } else {
           addressBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -6274,31 +6136,32 @@ public Builder setAddress(
       public Builder mergeAddress(org.apache.pekko.remote.testconductor.TestConductorProtocol.Address value) {
         if (addressBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
-              address_ != null &&
-              address_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance()) {
-            address_ =
-              org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.newBuilder(address_).mergeFrom(value).buildPartial();
+            address_ != null &&
+            address_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance()) {
+            getAddressBuilder().mergeFrom(value);
           } else {
             address_ = value;
           }
-          onChanged();
         } else {
           addressBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000004;
+        if (address_ != null) {
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .Address address = 3;
        */
       public Builder clearAddress() {
-        if (addressBuilder_ == null) {
-          address_ = null;
-          onChanged();
-        } else {
-          addressBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000004);
+        address_ = null;
+        if (addressBuilder_ != null) {
+          addressBuilder_.dispose();
+          addressBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -6342,6 +6205,7 @@ public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuil
        * optional float rateMBit = 6;
        * @return Whether the rateMBit field is set.
        */
+      @java.lang.Override
       public boolean hasRateMBit() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -6349,6 +6213,7 @@ public boolean hasRateMBit() {
        * optional float rateMBit = 6;
        * @return The rateMBit.
        */
+      @java.lang.Override
       public float getRateMBit() {
         return rateMBit_;
       }
@@ -6358,8 +6223,9 @@ public float getRateMBit() {
        * @return This builder for chaining.
        */
       public Builder setRateMBit(float value) {
-        bitField0_ |= 0x00000008;
+
         rateMBit_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -6379,6 +6245,7 @@ public Builder clearRateMBit() {
        * optional int32 exitValue = 7;
        * @return Whether the exitValue field is set.
        */
+      @java.lang.Override
       public boolean hasExitValue() {
         return ((bitField0_ & 0x00000010) != 0);
       }
@@ -6386,6 +6253,7 @@ public boolean hasExitValue() {
        * optional int32 exitValue = 7;
        * @return The exitValue.
        */
+      @java.lang.Override
       public int getExitValue() {
         return exitValue_;
       }
@@ -6395,8 +6263,9 @@ public int getExitValue() {
        * @return This builder for chaining.
        */
       public Builder setExitValue(int value) {
-        bitField0_ |= 0x00000010;
+
         exitValue_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -6443,7 +6312,18 @@ public InjectFailure parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new InjectFailure(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
diff --git a/persistence-query/src/main/java/org/apache/pekko/persistence/query/internal/protobuf/QueryMessages.java b/persistence-query/src/main/java/org/apache/pekko/persistence/query/internal/protobuf/QueryMessages.java
index 8ad0976ae36..8ac962169a7 100644
--- a/persistence-query/src/main/java/org/apache/pekko/persistence/query/internal/protobuf/QueryMessages.java
+++ b/persistence-query/src/main/java/org/apache/pekko/persistence/query/internal/protobuf/QueryMessages.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2021-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: QueryMessages.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.persistence.query.internal.protobuf;
 
 public final class QueryMessages {
@@ -212,128 +213,6 @@ protected java.lang.Object newInstance(
       return new EventEnvelope();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
-      return this.unknownFields;
-    }
-
-    private EventEnvelope(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000001;
-                persistenceId_ = bs;
-                break;
-              }
-            case 18:
-              {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000002;
-                entityType_ = bs;
-                break;
-              }
-            case 24:
-              {
-                bitField0_ |= 0x00000004;
-                slice_ = input.readInt32();
-                break;
-              }
-            case 32:
-              {
-                bitField0_ |= 0x00000008;
-                sequenceNr_ = input.readInt64();
-                break;
-              }
-            case 40:
-              {
-                bitField0_ |= 0x00000010;
-                timestamp_ = input.readInt64();
-                break;
-              }
-            case 50:
-              {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000020;
-                offset_ = bs;
-                break;
-              }
-            case 58:
-              {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000040;
-                offsetManifest_ = bs;
-                break;
-              }
-            case 66:
-              {
-                org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000080) != 0)) {
-                  subBuilder = event_.toBuilder();
-                }
-                event_ =
-                    input.readMessage(
-                        org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(event_);
-                  event_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000080;
-                break;
-              }
-            case 74:
-              {
-                org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000100) != 0)) {
-                  subBuilder = metadata_.toBuilder();
-                }
-                metadata_ =
-                    input.readMessage(
-                        org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(metadata_);
-                  metadata_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000100;
-                break;
-              }
-            default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
-            .setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.persistence.query.internal.protobuf.QueryMessages
@@ -354,12 +233,15 @@ private EventEnvelope(
 
     private int bitField0_;
     public static final int PERSISTENCE_ID_FIELD_NUMBER = 1;
-    private volatile java.lang.Object persistenceId_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object persistenceId_ = "";
     /**
      * required string persistence_id = 1;
      *
      * @return Whether the persistenceId field is set.
      */
+    @java.lang.Override
     public boolean hasPersistenceId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -368,6 +250,7 @@ public boolean hasPersistenceId() {
      *
      * @return The persistenceId.
      */
+    @java.lang.Override
     public java.lang.String getPersistenceId() {
       java.lang.Object ref = persistenceId_;
       if (ref instanceof java.lang.String) {
@@ -387,6 +270,7 @@ public java.lang.String getPersistenceId() {
      *
      * @return The bytes for persistenceId.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getPersistenceIdBytes() {
       java.lang.Object ref = persistenceId_;
       if (ref instanceof java.lang.String) {
@@ -400,12 +284,15 @@ public org.apache.pekko.protobufv3.internal.ByteString getPersistenceIdBytes() {
     }
 
     public static final int ENTITY_TYPE_FIELD_NUMBER = 2;
-    private volatile java.lang.Object entityType_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object entityType_ = "";
     /**
      * required string entity_type = 2;
      *
      * @return Whether the entityType field is set.
      */
+    @java.lang.Override
     public boolean hasEntityType() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -414,6 +301,7 @@ public boolean hasEntityType() {
      *
      * @return The entityType.
      */
+    @java.lang.Override
     public java.lang.String getEntityType() {
       java.lang.Object ref = entityType_;
       if (ref instanceof java.lang.String) {
@@ -433,6 +321,7 @@ public java.lang.String getEntityType() {
      *
      * @return The bytes for entityType.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getEntityTypeBytes() {
       java.lang.Object ref = entityType_;
       if (ref instanceof java.lang.String) {
@@ -446,12 +335,13 @@ public org.apache.pekko.protobufv3.internal.ByteString getEntityTypeBytes() {
     }
 
     public static final int SLICE_FIELD_NUMBER = 3;
-    private int slice_;
+    private int slice_ = 0;
     /**
      * required int32 slice = 3;
      *
      * @return Whether the slice field is set.
      */
+    @java.lang.Override
     public boolean hasSlice() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -460,17 +350,19 @@ public boolean hasSlice() {
      *
      * @return The slice.
      */
+    @java.lang.Override
     public int getSlice() {
       return slice_;
     }
 
     public static final int SEQUENCE_NR_FIELD_NUMBER = 4;
-    private long sequenceNr_;
+    private long sequenceNr_ = 0L;
     /**
      * required int64 sequence_nr = 4;
      *
      * @return Whether the sequenceNr field is set.
      */
+    @java.lang.Override
     public boolean hasSequenceNr() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -479,17 +371,19 @@ public boolean hasSequenceNr() {
      *
      * @return The sequenceNr.
      */
+    @java.lang.Override
     public long getSequenceNr() {
       return sequenceNr_;
     }
 
     public static final int TIMESTAMP_FIELD_NUMBER = 5;
-    private long timestamp_;
+    private long timestamp_ = 0L;
     /**
      * required int64 timestamp = 5;
      *
      * @return Whether the timestamp field is set.
      */
+    @java.lang.Override
     public boolean hasTimestamp() {
       return ((bitField0_ & 0x00000010) != 0);
     }
@@ -498,17 +392,21 @@ public boolean hasTimestamp() {
      *
      * @return The timestamp.
      */
+    @java.lang.Override
     public long getTimestamp() {
       return timestamp_;
     }
 
     public static final int OFFSET_FIELD_NUMBER = 6;
-    private volatile java.lang.Object offset_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object offset_ = "";
     /**
      * required string offset = 6;
      *
      * @return Whether the offset field is set.
      */
+    @java.lang.Override
     public boolean hasOffset() {
       return ((bitField0_ & 0x00000020) != 0);
     }
@@ -517,6 +415,7 @@ public boolean hasOffset() {
      *
      * @return The offset.
      */
+    @java.lang.Override
     public java.lang.String getOffset() {
       java.lang.Object ref = offset_;
       if (ref instanceof java.lang.String) {
@@ -536,6 +435,7 @@ public java.lang.String getOffset() {
      *
      * @return The bytes for offset.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getOffsetBytes() {
       java.lang.Object ref = offset_;
       if (ref instanceof java.lang.String) {
@@ -549,12 +449,15 @@ public org.apache.pekko.protobufv3.internal.ByteString getOffsetBytes() {
     }
 
     public static final int OFFSET_MANIFEST_FIELD_NUMBER = 7;
-    private volatile java.lang.Object offsetManifest_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object offsetManifest_ = "";
     /**
      * required string offset_manifest = 7;
      *
      * @return Whether the offsetManifest field is set.
      */
+    @java.lang.Override
     public boolean hasOffsetManifest() {
       return ((bitField0_ & 0x00000040) != 0);
     }
@@ -563,6 +466,7 @@ public boolean hasOffsetManifest() {
      *
      * @return The offsetManifest.
      */
+    @java.lang.Override
     public java.lang.String getOffsetManifest() {
       java.lang.Object ref = offsetManifest_;
       if (ref instanceof java.lang.String) {
@@ -582,6 +486,7 @@ public java.lang.String getOffsetManifest() {
      *
      * @return The bytes for offsetManifest.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getOffsetManifestBytes() {
       java.lang.Object ref = offsetManifest_;
       if (ref instanceof java.lang.String) {
@@ -601,6 +506,7 @@ public org.apache.pekko.protobufv3.internal.ByteString getOffsetManifestBytes()
      *
      * @return Whether the event field is set.
      */
+    @java.lang.Override
     public boolean hasEvent() {
       return ((bitField0_ & 0x00000080) != 0);
     }
@@ -609,12 +515,14 @@ public boolean hasEvent() {
      *
      * @return The event.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.Payload getEvent() {
       return event_ == null
           ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()
           : event_;
     }
     /** optional .Payload event = 8; */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getEventOrBuilder() {
       return event_ == null
           ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()
@@ -628,6 +536,7 @@ public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getEventOrBuild
      *
      * @return Whether the metadata field is set.
      */
+    @java.lang.Override
     public boolean hasMetadata() {
       return ((bitField0_ & 0x00000100) != 0);
     }
@@ -636,12 +545,14 @@ public boolean hasMetadata() {
      *
      * @return The metadata.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.Payload getMetadata() {
       return metadata_ == null
           ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()
           : metadata_;
     }
     /** optional .Payload metadata = 9; */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMetadataOrBuilder() {
       return metadata_ == null
           ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()
@@ -732,7 +643,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000100) != 0)) {
         output.writeMessage(9, getMetadata());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -781,7 +692,7 @@ public int getSerializedSize() {
             org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
                 9, getMetadata());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -835,7 +746,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasMetadata()) {
         if (!getMetadata().equals(other.getMetadata())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -883,7 +794,7 @@ public int hashCode() {
         hash = (37 * hash) + METADATA_FIELD_NUMBER;
         hash = (53 * hash) + getMetadata().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1056,32 +967,24 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         persistenceId_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         entityType_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         slice_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000004);
         sequenceNr_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000008);
         timestamp_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000010);
         offset_ = "";
-        bitField0_ = (bitField0_ & ~0x00000020);
         offsetManifest_ = "";
-        bitField0_ = (bitField0_ & ~0x00000040);
-        if (eventBuilder_ == null) {
-          event_ = null;
-        } else {
-          eventBuilder_.clear();
+        event_ = null;
+        if (eventBuilder_ != null) {
+          eventBuilder_.dispose();
+          eventBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000080);
-        if (metadataBuilder_ == null) {
-          metadata_ = null;
-        } else {
-          metadataBuilder_.clear();
+        metadata_ = null;
+        if (metadataBuilder_ != null) {
+          metadataBuilder_.dispose();
+          metadataBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000100);
         return this;
       }
 
@@ -1115,16 +1018,25 @@ public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor
         org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope result =
             new org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope(
                 this);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(
+          org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.persistenceId_ = persistenceId_;
           to_bitField0_ |= 0x00000001;
         }
-        result.persistenceId_ = persistenceId_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.entityType_ = entityType_;
           to_bitField0_ |= 0x00000002;
         }
-        result.entityType_ = entityType_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.slice_ = slice_;
           to_bitField0_ |= 0x00000004;
@@ -1138,32 +1050,22 @@ public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor
           to_bitField0_ |= 0x00000010;
         }
         if (((from_bitField0_ & 0x00000020) != 0)) {
+          result.offset_ = offset_;
           to_bitField0_ |= 0x00000020;
         }
-        result.offset_ = offset_;
         if (((from_bitField0_ & 0x00000040) != 0)) {
+          result.offsetManifest_ = offsetManifest_;
           to_bitField0_ |= 0x00000040;
         }
-        result.offsetManifest_ = offsetManifest_;
         if (((from_bitField0_ & 0x00000080) != 0)) {
-          if (eventBuilder_ == null) {
-            result.event_ = event_;
-          } else {
-            result.event_ = eventBuilder_.build();
-          }
+          result.event_ = eventBuilder_ == null ? event_ : eventBuilder_.build();
           to_bitField0_ |= 0x00000080;
         }
         if (((from_bitField0_ & 0x00000100) != 0)) {
-          if (metadataBuilder_ == null) {
-            result.metadata_ = metadata_;
-          } else {
-            result.metadata_ = metadataBuilder_.build();
-          }
+          result.metadata_ = metadataBuilder_ == null ? metadata_ : metadataBuilder_.build();
           to_bitField0_ |= 0x00000100;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1225,13 +1127,13 @@ public Builder mergeFrom(
             == org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
                 .getDefaultInstance()) return this;
         if (other.hasPersistenceId()) {
-          bitField0_ |= 0x00000001;
           persistenceId_ = other.persistenceId_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasEntityType()) {
-          bitField0_ |= 0x00000002;
           entityType_ = other.entityType_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasSlice()) {
@@ -1244,13 +1146,13 @@ public Builder mergeFrom(
           setTimestamp(other.getTimestamp());
         }
         if (other.hasOffset()) {
-          bitField0_ |= 0x00000020;
           offset_ = other.offset_;
+          bitField0_ |= 0x00000020;
           onChanged();
         }
         if (other.hasOffsetManifest()) {
-          bitField0_ |= 0x00000040;
           offsetManifest_ = other.offsetManifest_;
+          bitField0_ |= 0x00000040;
           onChanged();
         }
         if (other.hasEvent()) {
@@ -1259,7 +1161,7 @@ public Builder mergeFrom(
         if (other.hasMetadata()) {
           mergeMetadata(other.getMetadata());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1305,20 +1207,85 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
-            parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  persistenceId_ = input.readBytes();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+              case 18:
+                {
+                  entityType_ = input.readBytes();
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+              case 24:
+                {
+                  slice_ = input.readInt32();
+                  bitField0_ |= 0x00000004;
+                  break;
+                } // case 24
+              case 32:
+                {
+                  sequenceNr_ = input.readInt64();
+                  bitField0_ |= 0x00000008;
+                  break;
+                } // case 32
+              case 40:
+                {
+                  timestamp_ = input.readInt64();
+                  bitField0_ |= 0x00000010;
+                  break;
+                } // case 40
+              case 50:
+                {
+                  offset_ = input.readBytes();
+                  bitField0_ |= 0x00000020;
+                  break;
+                } // case 50
+              case 58:
+                {
+                  offsetManifest_ = input.readBytes();
+                  bitField0_ |= 0x00000040;
+                  break;
+                } // case 58
+              case 66:
+                {
+                  input.readMessage(getEventFieldBuilder().getBuilder(), extensionRegistry);
+                  bitField0_ |= 0x00000080;
+                  break;
+                } // case 66
+              case 74:
+                {
+                  input.readMessage(getMetadataFieldBuilder().getBuilder(), extensionRegistry);
+                  bitField0_ |= 0x00000100;
+                  break;
+                } // case 74
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope)
-                  e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
 
@@ -1378,8 +1345,8 @@ public Builder setPersistenceId(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000001;
         persistenceId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1389,8 +1356,8 @@ public Builder setPersistenceId(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearPersistenceId() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         persistenceId_ = getDefaultInstance().getPersistenceId();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1404,8 +1371,8 @@ public Builder setPersistenceIdBytes(org.apache.pekko.protobufv3.internal.ByteSt
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000001;
         persistenceId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1464,8 +1431,8 @@ public Builder setEntityType(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000002;
         entityType_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1475,8 +1442,8 @@ public Builder setEntityType(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearEntityType() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         entityType_ = getDefaultInstance().getEntityType();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1490,8 +1457,8 @@ public Builder setEntityTypeBytes(org.apache.pekko.protobufv3.internal.ByteStrin
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000002;
         entityType_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1502,6 +1469,7 @@ public Builder setEntityTypeBytes(org.apache.pekko.protobufv3.internal.ByteStrin
        *
        * @return Whether the slice field is set.
        */
+      @java.lang.Override
       public boolean hasSlice() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -1510,6 +1478,7 @@ public boolean hasSlice() {
        *
        * @return The slice.
        */
+      @java.lang.Override
       public int getSlice() {
         return slice_;
       }
@@ -1520,8 +1489,9 @@ public int getSlice() {
        * @return This builder for chaining.
        */
       public Builder setSlice(int value) {
-        bitField0_ |= 0x00000004;
+
         slice_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1543,6 +1513,7 @@ public Builder clearSlice() {
        *
        * @return Whether the sequenceNr field is set.
        */
+      @java.lang.Override
       public boolean hasSequenceNr() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -1551,6 +1522,7 @@ public boolean hasSequenceNr() {
        *
        * @return The sequenceNr.
        */
+      @java.lang.Override
       public long getSequenceNr() {
         return sequenceNr_;
       }
@@ -1561,8 +1533,9 @@ public long getSequenceNr() {
        * @return This builder for chaining.
        */
       public Builder setSequenceNr(long value) {
-        bitField0_ |= 0x00000008;
+
         sequenceNr_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -1584,6 +1557,7 @@ public Builder clearSequenceNr() {
        *
        * @return Whether the timestamp field is set.
        */
+      @java.lang.Override
       public boolean hasTimestamp() {
         return ((bitField0_ & 0x00000010) != 0);
       }
@@ -1592,6 +1566,7 @@ public boolean hasTimestamp() {
        *
        * @return The timestamp.
        */
+      @java.lang.Override
       public long getTimestamp() {
         return timestamp_;
       }
@@ -1602,8 +1577,9 @@ public long getTimestamp() {
        * @return This builder for chaining.
        */
       public Builder setTimestamp(long value) {
-        bitField0_ |= 0x00000010;
+
         timestamp_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1673,8 +1649,8 @@ public Builder setOffset(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000020;
         offset_ = value;
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -1684,8 +1660,8 @@ public Builder setOffset(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearOffset() {
-        bitField0_ = (bitField0_ & ~0x00000020);
         offset_ = getDefaultInstance().getOffset();
+        bitField0_ = (bitField0_ & ~0x00000020);
         onChanged();
         return this;
       }
@@ -1699,8 +1675,8 @@ public Builder setOffsetBytes(org.apache.pekko.protobufv3.internal.ByteString va
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000020;
         offset_ = value;
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -1759,8 +1735,8 @@ public Builder setOffsetManifest(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000040;
         offsetManifest_ = value;
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -1770,8 +1746,8 @@ public Builder setOffsetManifest(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearOffsetManifest() {
-        bitField0_ = (bitField0_ & ~0x00000040);
         offsetManifest_ = getDefaultInstance().getOffsetManifest();
+        bitField0_ = (bitField0_ & ~0x00000040);
         onChanged();
         return this;
       }
@@ -1785,8 +1761,8 @@ public Builder setOffsetManifestBytes(org.apache.pekko.protobufv3.internal.ByteS
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000040;
         offsetManifest_ = value;
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -1826,11 +1802,11 @@ public Builder setEvent(org.apache.pekko.remote.ContainerFormats.Payload value)
             throw new NullPointerException();
           }
           event_ = value;
-          onChanged();
         } else {
           eventBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000080;
+        onChanged();
         return this;
       }
       /** optional .Payload event = 8; */
@@ -1838,11 +1814,11 @@ public Builder setEvent(
           org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (eventBuilder_ == null) {
           event_ = builderForValue.build();
-          onChanged();
         } else {
           eventBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000080;
+        onChanged();
         return this;
       }
       /** optional .Payload event = 8; */
@@ -1851,29 +1827,28 @@ public Builder mergeEvent(org.apache.pekko.remote.ContainerFormats.Payload value
           if (((bitField0_ & 0x00000080) != 0)
               && event_ != null
               && event_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
-            event_ =
-                org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(event_)
-                    .mergeFrom(value)
-                    .buildPartial();
+            getEventBuilder().mergeFrom(value);
           } else {
             event_ = value;
           }
-          onChanged();
         } else {
           eventBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000080;
+        if (event_ != null) {
+          bitField0_ |= 0x00000080;
+          onChanged();
+        }
         return this;
       }
       /** optional .Payload event = 8; */
       public Builder clearEvent() {
-        if (eventBuilder_ == null) {
-          event_ = null;
-          onChanged();
-        } else {
-          eventBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000080);
+        event_ = null;
+        if (eventBuilder_ != null) {
+          eventBuilder_.dispose();
+          eventBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /** optional .Payload event = 8; */
@@ -1945,11 +1920,11 @@ public Builder setMetadata(org.apache.pekko.remote.ContainerFormats.Payload valu
             throw new NullPointerException();
           }
           metadata_ = value;
-          onChanged();
         } else {
           metadataBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000100;
+        onChanged();
         return this;
       }
       /** optional .Payload metadata = 9; */
@@ -1957,11 +1932,11 @@ public Builder setMetadata(
           org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (metadataBuilder_ == null) {
           metadata_ = builderForValue.build();
-          onChanged();
         } else {
           metadataBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000100;
+        onChanged();
         return this;
       }
       /** optional .Payload metadata = 9; */
@@ -1971,29 +1946,28 @@ public Builder mergeMetadata(org.apache.pekko.remote.ContainerFormats.Payload va
               && metadata_ != null
               && metadata_
                   != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
-            metadata_ =
-                org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(metadata_)
-                    .mergeFrom(value)
-                    .buildPartial();
+            getMetadataBuilder().mergeFrom(value);
           } else {
             metadata_ = value;
           }
-          onChanged();
         } else {
           metadataBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000100;
+        if (metadata_ != null) {
+          bitField0_ |= 0x00000100;
+          onChanged();
+        }
         return this;
       }
       /** optional .Payload metadata = 9; */
       public Builder clearMetadata() {
-        if (metadataBuilder_ == null) {
-          metadata_ = null;
-          onChanged();
-        } else {
-          metadataBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000100);
+        metadata_ = null;
+        if (metadataBuilder_ != null) {
+          metadataBuilder_.dispose();
+          metadataBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /** optional .Payload metadata = 9; */
@@ -2068,7 +2042,19 @@ public EventEnvelope parsePartialFrom(
               org.apache.pekko.protobufv3.internal.CodedInputStream input,
               org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
               throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-            return new EventEnvelope(input, extensionRegistry);
+            Builder builder = newBuilder();
+            try {
+              builder.mergeFrom(input, extensionRegistry);
+            } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+              throw e.setUnfinishedMessage(builder.buildPartial());
+            } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+              throw e.asInvalidProtocolBufferException()
+                  .setUnfinishedMessage(builder.buildPartial());
+            } catch (java.io.IOException e) {
+              throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                  .setUnfinishedMessage(builder.buildPartial());
+            }
+            return builder.buildPartial();
           }
         };
 
diff --git a/persistence-typed/src/main/java/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcing.java b/persistence-typed/src/main/java/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcing.java
index 5226491736d..f8d4325e85c 100644
--- a/persistence-typed/src/main/java/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcing.java
+++ b/persistence-typed/src/main/java/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcing.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2020-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ReplicatedEventSourcing.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.persistence.typed.serialization;
 
 public final class ReplicatedEventSourcing {
@@ -164,56 +165,6 @@ protected java.lang.Object newInstance(
       return new Counter();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
-      return this.unknownFields;
-    }
-
-    private Counter(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                bitField0_ |= 0x00000001;
-                value_ = input.readBytes();
-                break;
-              }
-            default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
-            .setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
@@ -234,12 +185,14 @@ private Counter(
 
     private int bitField0_;
     public static final int VALUE_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.ByteString value_;
+    private org.apache.pekko.protobufv3.internal.ByteString value_ =
+        org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * required bytes value = 1;
      *
      * @return Whether the value field is set.
      */
+    @java.lang.Override
     public boolean hasValue() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -248,6 +201,7 @@ public boolean hasValue() {
      *
      * @return The value.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getValue() {
       return value_;
     }
@@ -274,7 +228,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeBytes(1, value_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -286,7 +240,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000001) != 0)) {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream.computeBytesSize(1, value_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -308,7 +262,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasValue()) {
         if (!getValue().equals(other.getValue())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -323,7 +277,7 @@ public int hashCode() {
         hash = (37 * hash) + VALUE_FIELD_NUMBER;
         hash = (53 * hash) + getValue().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -468,25 +422,18 @@ public static final class Builder
 
       // Construct using
       // org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         value_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -520,15 +467,22 @@ public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor
         org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter result =
             new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter(
                 this);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.value_ = value_;
           to_bitField0_ |= 0x00000001;
         }
-        result.value_ = value_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -592,7 +546,7 @@ public Builder mergeFrom(
         if (other.hasValue()) {
           setValue(other.getValue());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -610,20 +564,37 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
-            parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  value_ = input.readBytes();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter)
-                  e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
 
@@ -636,6 +607,7 @@ public Builder mergeFrom(
        *
        * @return Whether the value field is set.
        */
+      @java.lang.Override
       public boolean hasValue() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -644,6 +616,7 @@ public boolean hasValue() {
        *
        * @return The value.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getValue() {
         return value_;
       }
@@ -657,8 +630,8 @@ public Builder setValue(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000001;
         value_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -712,7 +685,19 @@ public Counter parsePartialFrom(
               org.apache.pekko.protobufv3.internal.CodedInputStream input,
               org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
               throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-            return new Counter(input, extensionRegistry);
+            Builder builder = newBuilder();
+            try {
+              builder.mergeFrom(input, extensionRegistry);
+            } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+              throw e.setUnfinishedMessage(builder.buildPartial());
+            } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+              throw e.asInvalidProtocolBufferException()
+                  .setUnfinishedMessage(builder.buildPartial());
+            } catch (java.io.IOException e) {
+              throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                  .setUnfinishedMessage(builder.buildPartial());
+            }
+            return builder.buildPartial();
           }
         };
 
@@ -774,56 +759,6 @@ protected java.lang.Object newInstance(
       return new CounterUpdate();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
-      return this.unknownFields;
-    }
-
-    private CounterUpdate(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                bitField0_ |= 0x00000001;
-                delta_ = input.readBytes();
-                break;
-              }
-            default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
-            .setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
@@ -844,12 +779,14 @@ private CounterUpdate(
 
     private int bitField0_;
     public static final int DELTA_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.ByteString delta_;
+    private org.apache.pekko.protobufv3.internal.ByteString delta_ =
+        org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * required bytes delta = 1;
      *
      * @return Whether the delta field is set.
      */
+    @java.lang.Override
     public boolean hasDelta() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -858,6 +795,7 @@ public boolean hasDelta() {
      *
      * @return The delta.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getDelta() {
       return delta_;
     }
@@ -884,7 +822,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeBytes(1, delta_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -896,7 +834,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000001) != 0)) {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream.computeBytesSize(1, delta_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -919,7 +857,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasDelta()) {
         if (!getDelta().equals(other.getDelta())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -934,7 +872,7 @@ public int hashCode() {
         hash = (37 * hash) + DELTA_FIELD_NUMBER;
         hash = (53 * hash) + getDelta().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1092,25 +1030,18 @@ public static final class Builder
 
       // Construct using
       // org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         delta_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -1145,15 +1076,23 @@ public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor
             result =
                 new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .CounterUpdate(this);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
+              result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.delta_ = delta_;
           to_bitField0_ |= 0x00000001;
         }
-        result.delta_ = delta_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1220,7 +1159,7 @@ public Builder mergeFrom(
         if (other.hasDelta()) {
           setDelta(other.getDelta());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1238,21 +1177,37 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
-            parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  delta_ = input.readBytes();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                      .CounterUpdate)
-                  e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
 
@@ -1265,6 +1220,7 @@ public Builder mergeFrom(
        *
        * @return Whether the delta field is set.
        */
+      @java.lang.Override
       public boolean hasDelta() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -1273,6 +1229,7 @@ public boolean hasDelta() {
        *
        * @return The delta.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getDelta() {
         return delta_;
       }
@@ -1286,8 +1243,8 @@ public Builder setDelta(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000001;
         delta_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1343,7 +1300,19 @@ public CounterUpdate parsePartialFrom(
               org.apache.pekko.protobufv3.internal.CodedInputStream input,
               org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
               throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-            return new CounterUpdate(input, extensionRegistry);
+            Builder builder = newBuilder();
+            try {
+              builder.mergeFrom(input, extensionRegistry);
+            } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+              throw e.setUnfinishedMessage(builder.buildPartial());
+            } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+              throw e.asInvalidProtocolBufferException()
+                  .setUnfinishedMessage(builder.buildPartial());
+            } catch (java.io.IOException e) {
+              throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                  .setUnfinishedMessage(builder.buildPartial());
+            }
+            return builder.buildPartial();
           }
         };
 
@@ -1529,177 +1498,6 @@ protected java.lang.Object newInstance(
       return new ORSet();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
-      return this.unknownFields;
-    }
-
-    private ORSet(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000001;
-                originDc_ = bs;
-                break;
-              }
-            case 18:
-              {
-                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                        .VersionVector.Builder
-                    subBuilder = null;
-                if (((bitField0_ & 0x00000002) != 0)) {
-                  subBuilder = vvector_.toBuilder();
-                }
-                vvector_ =
-                    input.readMessage(
-                        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                            .VersionVector.PARSER,
-                        extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(vvector_);
-                  vvector_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000002;
-                break;
-              }
-            case 26:
-              {
-                if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                  dots_ =
-                      new java.util.ArrayList<
-                          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                              .VersionVector>();
-                  mutable_bitField0_ |= 0x00000004;
-                }
-                dots_.add(
-                    input.readMessage(
-                        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                            .VersionVector.PARSER,
-                        extensionRegistry));
-                break;
-              }
-            case 34:
-              {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                  stringElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                  mutable_bitField0_ |= 0x00000008;
-                }
-                stringElements_.add(bs);
-                break;
-              }
-            case 40:
-              {
-                if (!((mutable_bitField0_ & 0x00000010) != 0)) {
-                  intElements_ = newIntList();
-                  mutable_bitField0_ |= 0x00000010;
-                }
-                intElements_.addInt(input.readSInt32());
-                break;
-              }
-            case 42:
-              {
-                int length = input.readRawVarint32();
-                int limit = input.pushLimit(length);
-                if (!((mutable_bitField0_ & 0x00000010) != 0) && input.getBytesUntilLimit() > 0) {
-                  intElements_ = newIntList();
-                  mutable_bitField0_ |= 0x00000010;
-                }
-                while (input.getBytesUntilLimit() > 0) {
-                  intElements_.addInt(input.readSInt32());
-                }
-                input.popLimit(limit);
-                break;
-              }
-            case 48:
-              {
-                if (!((mutable_bitField0_ & 0x00000020) != 0)) {
-                  longElements_ = newLongList();
-                  mutable_bitField0_ |= 0x00000020;
-                }
-                longElements_.addLong(input.readSInt64());
-                break;
-              }
-            case 50:
-              {
-                int length = input.readRawVarint32();
-                int limit = input.pushLimit(length);
-                if (!((mutable_bitField0_ & 0x00000020) != 0) && input.getBytesUntilLimit() > 0) {
-                  longElements_ = newLongList();
-                  mutable_bitField0_ |= 0x00000020;
-                }
-                while (input.getBytesUntilLimit() > 0) {
-                  longElements_.addLong(input.readSInt64());
-                }
-                input.popLimit(limit);
-                break;
-              }
-            case 58:
-              {
-                if (!((mutable_bitField0_ & 0x00000040) != 0)) {
-                  otherElements_ =
-                      new java.util.ArrayList();
-                  mutable_bitField0_ |= 0x00000040;
-                }
-                otherElements_.add(
-                    input.readMessage(
-                        org.apache.pekko.remote.ContainerFormats.Payload.PARSER,
-                        extensionRegistry));
-                break;
-              }
-            default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
-            .setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          dots_ = java.util.Collections.unmodifiableList(dots_);
-        }
-        if (((mutable_bitField0_ & 0x00000008) != 0)) {
-          stringElements_ = stringElements_.getUnmodifiableView();
-        }
-        if (((mutable_bitField0_ & 0x00000010) != 0)) {
-          intElements_.makeImmutable(); // C
-        }
-        if (((mutable_bitField0_ & 0x00000020) != 0)) {
-          longElements_.makeImmutable(); // C
-        }
-        if (((mutable_bitField0_ & 0x00000040) != 0)) {
-          otherElements_ = java.util.Collections.unmodifiableList(otherElements_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
@@ -1719,12 +1517,15 @@ private ORSet(
 
     private int bitField0_;
     public static final int ORIGINDC_FIELD_NUMBER = 1;
-    private volatile java.lang.Object originDc_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object originDc_ = "";
     /**
      * required string originDc = 1;
      *
      * @return Whether the originDc field is set.
      */
+    @java.lang.Override
     public boolean hasOriginDc() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -1733,6 +1534,7 @@ public boolean hasOriginDc() {
      *
      * @return The originDc.
      */
+    @java.lang.Override
     public java.lang.String getOriginDc() {
       java.lang.Object ref = originDc_;
       if (ref instanceof java.lang.String) {
@@ -1752,6 +1554,7 @@ public java.lang.String getOriginDc() {
      *
      * @return The bytes for originDc.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getOriginDcBytes() {
       java.lang.Object ref = originDc_;
       if (ref instanceof java.lang.String) {
@@ -1772,6 +1575,7 @@ public org.apache.pekko.protobufv3.internal.ByteString getOriginDcBytes() {
      *
      * @return Whether the vvector field is set.
      */
+    @java.lang.Override
     public boolean hasVvector() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -1780,6 +1584,7 @@ public boolean hasVvector() {
      *
      * @return The vvector.
      */
+    @java.lang.Override
     public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
         getVvector() {
       return vvector_ == null
@@ -1788,6 +1593,7 @@ public boolean hasVvector() {
           : vvector_;
     }
     /** required .VersionVector vvector = 2; */
+    @java.lang.Override
     public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .VersionVectorOrBuilder
         getVvectorOrBuilder() {
@@ -1798,16 +1604,20 @@ public boolean hasVvector() {
     }
 
     public static final int DOTS_FIELD_NUMBER = 3;
+
+    @SuppressWarnings("serial")
     private java.util.List<
             org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector>
         dots_;
     /** repeated .VersionVector dots = 3; */
+    @java.lang.Override
     public java.util.List<
             org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector>
         getDotsList() {
       return dots_;
     }
     /** repeated .VersionVector dots = 3; */
+    @java.lang.Override
     public java.util.List<
             ? extends
                 org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
@@ -1816,15 +1626,18 @@ public boolean hasVvector() {
       return dots_;
     }
     /** repeated .VersionVector dots = 3; */
+    @java.lang.Override
     public int getDotsCount() {
       return dots_.size();
     }
     /** repeated .VersionVector dots = 3; */
+    @java.lang.Override
     public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
         getDots(int index) {
       return dots_.get(index);
     }
     /** repeated .VersionVector dots = 3; */
+    @java.lang.Override
     public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .VersionVectorOrBuilder
         getDotsOrBuilder(int index) {
@@ -1832,7 +1645,10 @@ public int getDotsCount() {
     }
 
     public static final int STRINGELEMENTS_FIELD_NUMBER = 4;
-    private org.apache.pekko.protobufv3.internal.LazyStringList stringElements_;
+
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList stringElements_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string stringElements = 4;
      *
@@ -1869,12 +1685,15 @@ public org.apache.pekko.protobufv3.internal.ByteString getStringElementsBytes(in
     }
 
     public static final int INTELEMENTS_FIELD_NUMBER = 5;
-    private org.apache.pekko.protobufv3.internal.Internal.IntList intElements_;
+
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.Internal.IntList intElements_ = emptyIntList();
     /**
      * repeated sint32 intElements = 5 [packed = true];
      *
      * @return A list containing the intElements.
      */
+    @java.lang.Override
     public java.util.List getIntElementsList() {
       return intElements_;
     }
@@ -1899,12 +1718,15 @@ public int getIntElements(int index) {
     private int intElementsMemoizedSerializedSize = -1;
 
     public static final int LONGELEMENTS_FIELD_NUMBER = 6;
-    private org.apache.pekko.protobufv3.internal.Internal.LongList longElements_;
+
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.Internal.LongList longElements_ = emptyLongList();
     /**
      * repeated sint64 longElements = 6 [packed = true];
      *
      * @return A list containing the longElements.
      */
+    @java.lang.Override
     public java.util.List getLongElementsList() {
       return longElements_;
     }
@@ -1929,25 +1751,32 @@ public long getLongElements(int index) {
     private int longElementsMemoizedSerializedSize = -1;
 
     public static final int OTHERELEMENTS_FIELD_NUMBER = 7;
+
+    @SuppressWarnings("serial")
     private java.util.List otherElements_;
     /** repeated .Payload otherElements = 7; */
+    @java.lang.Override
     public java.util.List getOtherElementsList() {
       return otherElements_;
     }
     /** repeated .Payload otherElements = 7; */
+    @java.lang.Override
     public java.util.List
         getOtherElementsOrBuilderList() {
       return otherElements_;
     }
     /** repeated .Payload otherElements = 7; */
+    @java.lang.Override
     public int getOtherElementsCount() {
       return otherElements_.size();
     }
     /** repeated .Payload otherElements = 7; */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.Payload getOtherElements(int index) {
       return otherElements_.get(index);
     }
     /** repeated .Payload otherElements = 7; */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getOtherElementsOrBuilder(
         int index) {
       return otherElements_.get(index);
@@ -2023,7 +1852,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < otherElements_.size(); i++) {
         output.writeMessage(7, otherElements_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -2091,7 +1920,7 @@ public int getSerializedSize() {
             org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
                 7, otherElements_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2122,7 +1951,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getIntElementsList().equals(other.getIntElementsList())) return false;
       if (!getLongElementsList().equals(other.getLongElementsList())) return false;
       if (!getOtherElementsList().equals(other.getOtherElementsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -2161,7 +1990,7 @@ public int hashCode() {
         hash = (37 * hash) + OTHERELEMENTS_FIELD_NUMBER;
         hash = (53 * hash) + getOtherElementsList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -2326,32 +2155,30 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         originDc_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (vvectorBuilder_ == null) {
-          vvector_ = null;
-        } else {
-          vvectorBuilder_.clear();
+        vvector_ = null;
+        if (vvectorBuilder_ != null) {
+          vvectorBuilder_.dispose();
+          vvectorBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         if (dotsBuilder_ == null) {
           dots_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
         } else {
+          dots_ = null;
           dotsBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000004);
         stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
         intElements_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000010);
         longElements_ = emptyLongList();
-        bitField0_ = (bitField0_ & ~0x00000020);
         if (otherElementsBuilder_ == null) {
           otherElements_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000040);
         } else {
+          otherElements_ = null;
           otherElementsBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000040);
         return this;
       }
 
@@ -2385,20 +2212,16 @@ public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor
         org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet result =
             new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet(
                 this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.originDc_ = originDc_;
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (vvectorBuilder_ == null) {
-            result.vvector_ = vvector_;
-          } else {
-            result.vvector_ = vvectorBuilder_.build();
-          }
-          to_bitField0_ |= 0x00000002;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet result) {
         if (dotsBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0)) {
             dots_ = java.util.Collections.unmodifiableList(dots_);
@@ -2408,21 +2231,6 @@ public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor
         } else {
           result.dots_ = dotsBuilder_.build();
         }
-        if (((bitField0_ & 0x00000008) != 0)) {
-          stringElements_ = stringElements_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000008);
-        }
-        result.stringElements_ = stringElements_;
-        if (((bitField0_ & 0x00000010) != 0)) {
-          intElements_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000010);
-        }
-        result.intElements_ = intElements_;
-        if (((bitField0_ & 0x00000020) != 0)) {
-          longElements_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000020);
-        }
-        result.longElements_ = longElements_;
         if (otherElementsBuilder_ == null) {
           if (((bitField0_ & 0x00000040) != 0)) {
             otherElements_ = java.util.Collections.unmodifiableList(otherElements_);
@@ -2432,9 +2240,33 @@ public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor
         } else {
           result.otherElements_ = otherElementsBuilder_.build();
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.originDc_ = originDc_;
+          to_bitField0_ |= 0x00000001;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.vvector_ = vvectorBuilder_ == null ? vvector_ : vvectorBuilder_.build();
+          to_bitField0_ |= 0x00000002;
+        }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          stringElements_.makeImmutable();
+          result.stringElements_ = stringElements_;
+        }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          intElements_.makeImmutable();
+          result.intElements_ = intElements_;
+        }
+        if (((from_bitField0_ & 0x00000020) != 0)) {
+          longElements_.makeImmutable();
+          result.longElements_ = longElements_;
+        }
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -2496,8 +2328,8 @@ public Builder mergeFrom(
             == org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
                 .getDefaultInstance()) return this;
         if (other.hasOriginDc()) {
-          bitField0_ |= 0x00000001;
           originDc_ = other.originDc_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasVvector()) {
@@ -2533,7 +2365,7 @@ public Builder mergeFrom(
         if (!other.stringElements_.isEmpty()) {
           if (stringElements_.isEmpty()) {
             stringElements_ = other.stringElements_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ |= 0x00000008;
           } else {
             ensureStringElementsIsMutable();
             stringElements_.addAll(other.stringElements_);
@@ -2543,7 +2375,8 @@ public Builder mergeFrom(
         if (!other.intElements_.isEmpty()) {
           if (intElements_.isEmpty()) {
             intElements_ = other.intElements_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            intElements_.makeImmutable();
+            bitField0_ |= 0x00000010;
           } else {
             ensureIntElementsIsMutable();
             intElements_.addAll(other.intElements_);
@@ -2553,7 +2386,8 @@ public Builder mergeFrom(
         if (!other.longElements_.isEmpty()) {
           if (longElements_.isEmpty()) {
             longElements_ = other.longElements_;
-            bitField0_ = (bitField0_ & ~0x00000020);
+            longElements_.makeImmutable();
+            bitField0_ |= 0x00000020;
           } else {
             ensureLongElementsIsMutable();
             longElements_.addAll(other.longElements_);
@@ -2587,7 +2421,7 @@ public Builder mergeFrom(
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -2621,27 +2455,124 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
-            parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet)
-                  e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
         }
-        return this;
-      }
-
-      private int bitField0_;
-
-      private java.lang.Object originDc_ = "";
-      /**
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  originDc_ = input.readBytes();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+              case 18:
+                {
+                  input.readMessage(getVvectorFieldBuilder().getBuilder(), extensionRegistry);
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+              case 26:
+                {
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                          .VersionVector
+                      m =
+                          input.readMessage(
+                              org.apache.pekko.persistence.typed.serialization
+                                  .ReplicatedEventSourcing.VersionVector.PARSER,
+                              extensionRegistry);
+                  if (dotsBuilder_ == null) {
+                    ensureDotsIsMutable();
+                    dots_.add(m);
+                  } else {
+                    dotsBuilder_.addMessage(m);
+                  }
+                  break;
+                } // case 26
+              case 34:
+                {
+                  org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                  ensureStringElementsIsMutable();
+                  stringElements_.add(bs);
+                  break;
+                } // case 34
+              case 40:
+                {
+                  int v = input.readSInt32();
+                  ensureIntElementsIsMutable();
+                  intElements_.addInt(v);
+                  break;
+                } // case 40
+              case 42:
+                {
+                  int length = input.readRawVarint32();
+                  int limit = input.pushLimit(length);
+                  ensureIntElementsIsMutable();
+                  while (input.getBytesUntilLimit() > 0) {
+                    intElements_.addInt(input.readSInt32());
+                  }
+                  input.popLimit(limit);
+                  break;
+                } // case 42
+              case 48:
+                {
+                  long v = input.readSInt64();
+                  ensureLongElementsIsMutable();
+                  longElements_.addLong(v);
+                  break;
+                } // case 48
+              case 50:
+                {
+                  int length = input.readRawVarint32();
+                  int limit = input.pushLimit(length);
+                  ensureLongElementsIsMutable();
+                  while (input.getBytesUntilLimit() > 0) {
+                    longElements_.addLong(input.readSInt64());
+                  }
+                  input.popLimit(limit);
+                  break;
+                } // case 50
+              case 58:
+                {
+                  org.apache.pekko.remote.ContainerFormats.Payload m =
+                      input.readMessage(
+                          org.apache.pekko.remote.ContainerFormats.Payload.PARSER,
+                          extensionRegistry);
+                  if (otherElementsBuilder_ == null) {
+                    ensureOtherElementsIsMutable();
+                    otherElements_.add(m);
+                  } else {
+                    otherElementsBuilder_.addMessage(m);
+                  }
+                  break;
+                } // case 58
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
+        } finally {
+          onChanged();
+        } // finally
+        return this;
+      }
+
+      private int bitField0_;
+
+      private java.lang.Object originDc_ = "";
+      /**
        * required string originDc = 1;
        *
        * @return Whether the originDc field is set.
@@ -2694,8 +2625,8 @@ public Builder setOriginDc(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000001;
         originDc_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2705,8 +2636,8 @@ public Builder setOriginDc(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearOriginDc() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         originDc_ = getDefaultInstance().getOriginDc();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -2720,8 +2651,8 @@ public Builder setOriginDcBytes(org.apache.pekko.protobufv3.internal.ByteString
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000001;
         originDc_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2769,11 +2700,11 @@ public Builder setVvector(
             throw new NullPointerException();
           }
           vvector_ = value;
-          onChanged();
         } else {
           vvectorBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /** required .VersionVector vvector = 2; */
@@ -2783,11 +2714,11 @@ public Builder setVvector(
               builderForValue) {
         if (vvectorBuilder_ == null) {
           vvector_ = builderForValue.build();
-          onChanged();
         } else {
           vvectorBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /** required .VersionVector vvector = 2; */
@@ -2800,30 +2731,28 @@ public Builder mergeVvector(
               && vvector_
                   != org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .VersionVector.getDefaultInstance()) {
-            vvector_ =
-                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                    .VersionVector.newBuilder(vvector_)
-                    .mergeFrom(value)
-                    .buildPartial();
+            getVvectorBuilder().mergeFrom(value);
           } else {
             vvector_ = value;
           }
-          onChanged();
         } else {
           vvectorBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (vvector_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /** required .VersionVector vvector = 2; */
       public Builder clearVvector() {
-        if (vvectorBuilder_ == null) {
-          vvector_ = null;
-          onChanged();
-        } else {
-          vvectorBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        vvector_ = null;
+        if (vvectorBuilder_ != null) {
+          vvectorBuilder_.dispose();
+          vvectorBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /** required .VersionVector vvector = 2; */
@@ -3132,15 +3061,15 @@ public Builder removeDots(int index) {
         return dotsBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList stringElements_ =
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList stringElements_ =
           org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
 
       private void ensureStringElementsIsMutable() {
-        if (!((bitField0_ & 0x00000008) != 0)) {
+        if (!stringElements_.isModifiable()) {
           stringElements_ =
               new org.apache.pekko.protobufv3.internal.LazyStringArrayList(stringElements_);
-          bitField0_ |= 0x00000008;
         }
+        bitField0_ |= 0x00000008;
       }
       /**
        * repeated string stringElements = 4;
@@ -3148,7 +3077,8 @@ private void ensureStringElementsIsMutable() {
        * @return A list containing the stringElements.
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList getStringElementsList() {
-        return stringElements_.getUnmodifiableView();
+        stringElements_.makeImmutable();
+        return stringElements_;
       }
       /**
        * repeated string stringElements = 4;
@@ -3189,6 +3119,7 @@ public Builder setStringElements(int index, java.lang.String value) {
         }
         ensureStringElementsIsMutable();
         stringElements_.set(index, value);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -3204,6 +3135,7 @@ public Builder addStringElements(java.lang.String value) {
         }
         ensureStringElementsIsMutable();
         stringElements_.add(value);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -3217,6 +3149,7 @@ public Builder addAllStringElements(java.lang.Iterable values)
         ensureStringElementsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, stringElements_);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -3228,6 +3161,7 @@ public Builder addAllStringElements(java.lang.Iterable values)
       public Builder clearStringElements() {
         stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000008);
+        ;
         onChanged();
         return this;
       }
@@ -3243,6 +3177,7 @@ public Builder addStringElementsBytes(org.apache.pekko.protobufv3.internal.ByteS
         }
         ensureStringElementsIsMutable();
         stringElements_.add(value);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -3250,10 +3185,10 @@ public Builder addStringElementsBytes(org.apache.pekko.protobufv3.internal.ByteS
       private org.apache.pekko.protobufv3.internal.Internal.IntList intElements_ = emptyIntList();
 
       private void ensureIntElementsIsMutable() {
-        if (!((bitField0_ & 0x00000010) != 0)) {
-          intElements_ = mutableCopy(intElements_);
-          bitField0_ |= 0x00000010;
+        if (!intElements_.isModifiable()) {
+          intElements_ = makeMutableCopy(intElements_);
         }
+        bitField0_ |= 0x00000010;
       }
       /**
        * repeated sint32 intElements = 5 [packed = true];
@@ -3261,9 +3196,8 @@ private void ensureIntElementsIsMutable() {
        * @return A list containing the intElements.
        */
       public java.util.List getIntElementsList() {
-        return ((bitField0_ & 0x00000010) != 0)
-            ? java.util.Collections.unmodifiableList(intElements_)
-            : intElements_;
+        intElements_.makeImmutable();
+        return intElements_;
       }
       /**
        * repeated sint32 intElements = 5 [packed = true];
@@ -3290,8 +3224,10 @@ public int getIntElements(int index) {
        * @return This builder for chaining.
        */
       public Builder setIntElements(int index, int value) {
+
         ensureIntElementsIsMutable();
         intElements_.setInt(index, value);
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -3302,8 +3238,10 @@ public Builder setIntElements(int index, int value) {
        * @return This builder for chaining.
        */
       public Builder addIntElements(int value) {
+
         ensureIntElementsIsMutable();
         intElements_.addInt(value);
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -3317,6 +3255,7 @@ public Builder addAllIntElements(java.lang.Iterable
         ensureIntElementsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, intElements_);
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -3336,10 +3275,10 @@ public Builder clearIntElements() {
           emptyLongList();
 
       private void ensureLongElementsIsMutable() {
-        if (!((bitField0_ & 0x00000020) != 0)) {
-          longElements_ = mutableCopy(longElements_);
-          bitField0_ |= 0x00000020;
+        if (!longElements_.isModifiable()) {
+          longElements_ = makeMutableCopy(longElements_);
         }
+        bitField0_ |= 0x00000020;
       }
       /**
        * repeated sint64 longElements = 6 [packed = true];
@@ -3347,9 +3286,8 @@ private void ensureLongElementsIsMutable() {
        * @return A list containing the longElements.
        */
       public java.util.List getLongElementsList() {
-        return ((bitField0_ & 0x00000020) != 0)
-            ? java.util.Collections.unmodifiableList(longElements_)
-            : longElements_;
+        longElements_.makeImmutable();
+        return longElements_;
       }
       /**
        * repeated sint64 longElements = 6 [packed = true];
@@ -3376,8 +3314,10 @@ public long getLongElements(int index) {
        * @return This builder for chaining.
        */
       public Builder setLongElements(int index, long value) {
+
         ensureLongElementsIsMutable();
         longElements_.setLong(index, value);
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -3388,8 +3328,10 @@ public Builder setLongElements(int index, long value) {
        * @return This builder for chaining.
        */
       public Builder addLongElements(long value) {
+
         ensureLongElementsIsMutable();
         longElements_.addLong(value);
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -3403,6 +3345,7 @@ public Builder addAllLongElements(java.lang.Iterable v
         ensureLongElementsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, longElements_);
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -3675,7 +3618,19 @@ public ORSet parsePartialFrom(
               org.apache.pekko.protobufv3.internal.CodedInputStream input,
               org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
               throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-            return new ORSet(input, extensionRegistry);
+            Builder builder = newBuilder();
+            try {
+              builder.mergeFrom(input, extensionRegistry);
+            } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+              throw e.setUnfinishedMessage(builder.buildPartial());
+            } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+              throw e.asInvalidProtocolBufferException()
+                  .setUnfinishedMessage(builder.buildPartial());
+            } catch (java.io.IOException e) {
+              throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                  .setUnfinishedMessage(builder.buildPartial());
+            }
+            return builder.buildPartial();
           }
         };
 
@@ -3745,69 +3700,6 @@ protected java.lang.Object newInstance(
       return new ORSetDeltaGroup();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
-      return this.unknownFields;
-    }
-
-    private ORSetDeltaGroup(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                  entries_ =
-                      new java.util.ArrayList<
-                          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                              .ORSetDeltaGroup.Entry>();
-                  mutable_bitField0_ |= 0x00000001;
-                }
-                entries_.add(
-                    input.readMessage(
-                        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                            .ORSetDeltaGroup.Entry.PARSER,
-                        extensionRegistry));
-                break;
-              }
-            default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
-            .setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          entries_ = java.util.Collections.unmodifiableList(entries_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
@@ -3884,87 +3776,6 @@ protected java.lang.Object newInstance(
         return new Entry();
       }
 
-      @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
-        return this.unknownFields;
-      }
-
-      private Entry(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 8:
-                {
-                  int rawValue = input.readEnum();
-                  @SuppressWarnings("deprecation")
-                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                          .ORSetDeltaOp
-                      value =
-                          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                              .ORSetDeltaOp.valueOf(rawValue);
-                  if (value == null) {
-                    unknownFields.mergeVarintField(1, rawValue);
-                  } else {
-                    bitField0_ |= 0x00000001;
-                    operation_ = rawValue;
-                  }
-                  break;
-                }
-              case 18:
-                {
-                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
-                          .Builder
-                      subBuilder = null;
-                  if (((bitField0_ & 0x00000002) != 0)) {
-                    subBuilder = underlying_.toBuilder();
-                  }
-                  underlying_ =
-                      input.readMessage(
-                          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                              .ORSet.PARSER,
-                          extensionRegistry);
-                  if (subBuilder != null) {
-                    subBuilder.mergeFrom(underlying_);
-                    underlying_ = subBuilder.buildPartial();
-                  }
-                  bitField0_ |= 0x00000002;
-                  break;
-                }
-              default:
-                {
-                  if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                    done = true;
-                  }
-                  break;
-                }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
-              .setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
-
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
@@ -3985,12 +3796,13 @@ private Entry(
 
       private int bitField0_;
       public static final int OPERATION_FIELD_NUMBER = 1;
-      private int operation_;
+      private int operation_ = 0;
       /**
        * required .ORSetDeltaOp operation = 1;
        *
        * @return Whether the operation field is set.
        */
+      @java.lang.Override
       public boolean hasOperation() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -3999,13 +3811,13 @@ public boolean hasOperation() {
        *
        * @return The operation.
        */
+      @java.lang.Override
       public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp
           getOperation() {
-        @SuppressWarnings("deprecation")
         org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp
             result =
                 org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                    .ORSetDeltaOp.valueOf(operation_);
+                    .ORSetDeltaOp.forNumber(operation_);
         return result == null
             ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp
                 .Add
@@ -4020,6 +3832,7 @@ public boolean hasOperation() {
        *
        * @return Whether the underlying field is set.
        */
+      @java.lang.Override
       public boolean hasUnderlying() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -4028,6 +3841,7 @@ public boolean hasUnderlying() {
        *
        * @return The underlying.
        */
+      @java.lang.Override
       public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
           getUnderlying() {
         return underlying_ == null
@@ -4036,6 +3850,7 @@ public boolean hasUnderlying() {
             : underlying_;
       }
       /** required .ORSet underlying = 2; */
+      @java.lang.Override
       public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetOrBuilder
           getUnderlyingOrBuilder() {
         return underlying_ == null
@@ -4077,7 +3892,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeMessage(2, getUnderlying());
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -4095,7 +3910,7 @@ public int getSerializedSize() {
               org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
                   2, getUnderlying());
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -4126,7 +3941,7 @@ public boolean equals(final java.lang.Object obj) {
         if (hasUnderlying()) {
           if (!getUnderlying().equals(other.getUnderlying())) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -4145,7 +3960,7 @@ public int hashCode() {
           hash = (37 * hash) + UNDERLYING_FIELD_NUMBER;
           hash = (53 * hash) + getUnderlying().hashCode();
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -4323,14 +4138,13 @@ private void maybeForceBuilderInitialization() {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           operation_ = 0;
-          bitField0_ = (bitField0_ & ~0x00000001);
-          if (underlyingBuilder_ == null) {
-            underlying_ = null;
-          } else {
-            underlyingBuilder_.clear();
+          underlying_ = null;
+          if (underlyingBuilder_ != null) {
+            underlyingBuilder_.dispose();
+            underlyingBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
@@ -4370,23 +4184,29 @@ public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor
               result =
                   new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ORSetDeltaGroup.Entry(this);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+                    .Entry
+                result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.operation_ = operation_;
             to_bitField0_ |= 0x00000001;
           }
-          result.operation_ = operation_;
           if (((from_bitField0_ & 0x00000002) != 0)) {
-            if (underlyingBuilder_ == null) {
-              result.underlying_ = underlying_;
-            } else {
-              result.underlying_ = underlyingBuilder_.build();
-            }
+            result.underlying_ =
+                underlyingBuilder_ == null ? underlying_ : underlyingBuilder_.build();
             to_bitField0_ |= 0x00000002;
           }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -4457,7 +4277,7 @@ public Builder mergeFrom(
           if (other.hasUnderlying()) {
             mergeUnderlying(other.getUnderlying());
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -4481,22 +4301,53 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-                  .Entry
-              parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 8:
+                  {
+                    int tmpRaw = input.readEnum();
+                    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                            .ORSetDeltaOp
+                        tmpValue =
+                            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                                .ORSetDeltaOp.forNumber(tmpRaw);
+                    if (tmpValue == null) {
+                      mergeUnknownVarintField(1, tmpRaw);
+                    } else {
+                      operation_ = tmpRaw;
+                      bitField0_ |= 0x00000001;
+                    }
+                    break;
+                  } // case 8
+                case 18:
+                  {
+                    input.readMessage(getUnderlyingFieldBuilder().getBuilder(), extensionRegistry);
+                    bitField0_ |= 0x00000002;
+                    break;
+                  } // case 18
+                default:
+                  {
+                    if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                      done = true; // was an endgroup tag
+                    }
+                    break;
+                  } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage =
-                (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                        .ORSetDeltaGroup.Entry)
-                    e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
 
@@ -4508,6 +4359,7 @@ public Builder mergeFrom(
          *
          * @return Whether the operation field is set.
          */
+        @java.lang.Override
         public boolean hasOperation() {
           return ((bitField0_ & 0x00000001) != 0);
         }
@@ -4516,13 +4368,13 @@ public boolean hasOperation() {
          *
          * @return The operation.
          */
+        @java.lang.Override
         public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp
             getOperation() {
-          @SuppressWarnings("deprecation")
           org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp
               result =
                   org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                      .ORSetDeltaOp.valueOf(operation_);
+                      .ORSetDeltaOp.forNumber(operation_);
           return result == null
               ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ORSetDeltaOp.Add
@@ -4598,11 +4450,11 @@ public Builder setUnderlying(
               throw new NullPointerException();
             }
             underlying_ = value;
-            onChanged();
           } else {
             underlyingBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /** required .ORSet underlying = 2; */
@@ -4611,11 +4463,11 @@ public Builder setUnderlying(
                 builderForValue) {
           if (underlyingBuilder_ == null) {
             underlying_ = builderForValue.build();
-            onChanged();
           } else {
             underlyingBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000002;
+          onChanged();
           return this;
         }
         /** required .ORSet underlying = 2; */
@@ -4627,30 +4479,28 @@ public Builder mergeUnderlying(
                 && underlying_
                     != org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                         .ORSet.getDefaultInstance()) {
-              underlying_ =
-                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
-                      .newBuilder(underlying_)
-                      .mergeFrom(value)
-                      .buildPartial();
+              getUnderlyingBuilder().mergeFrom(value);
             } else {
               underlying_ = value;
             }
-            onChanged();
           } else {
             underlyingBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000002;
+          if (underlying_ != null) {
+            bitField0_ |= 0x00000002;
+            onChanged();
+          }
           return this;
         }
         /** required .ORSet underlying = 2; */
         public Builder clearUnderlying() {
-          if (underlyingBuilder_ == null) {
-            underlying_ = null;
-            onChanged();
-          } else {
-            underlyingBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000002);
+          underlying_ = null;
+          if (underlyingBuilder_ != null) {
+            underlyingBuilder_.dispose();
+            underlyingBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /** required .ORSet underlying = 2; */
@@ -4735,7 +4585,19 @@ public Entry parsePartialFrom(
                 org.apache.pekko.protobufv3.internal.CodedInputStream input,
                 org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
                 throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-              return new Entry(input, extensionRegistry);
+              Builder builder = newBuilder();
+              try {
+                builder.mergeFrom(input, extensionRegistry);
+              } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+                throw e.setUnfinishedMessage(builder.buildPartial());
+              } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+                throw e.asInvalidProtocolBufferException()
+                    .setUnfinishedMessage(builder.buildPartial());
+              } catch (java.io.IOException e) {
+                throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                    .setUnfinishedMessage(builder.buildPartial());
+              }
+              return builder.buildPartial();
             }
           };
 
@@ -4757,11 +4619,14 @@ public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 1;
+
+    @SuppressWarnings("serial")
     private java.util.List<
             org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
                 .Entry>
         entries_;
     /** repeated .ORSetDeltaGroup.Entry entries = 1; */
+    @java.lang.Override
     public java.util.List<
             org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
                 .Entry>
@@ -4769,6 +4634,7 @@ public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return entries_;
     }
     /** repeated .ORSetDeltaGroup.Entry entries = 1; */
+    @java.lang.Override
     public java.util.List<
             ? extends
                 org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
@@ -4777,16 +4643,19 @@ public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return entries_;
     }
     /** repeated .ORSetDeltaGroup.Entry entries = 1; */
+    @java.lang.Override
     public int getEntriesCount() {
       return entries_.size();
     }
     /** repeated .ORSetDeltaGroup.Entry entries = 1; */
+    @java.lang.Override
     public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
             .Entry
         getEntries(int index) {
       return entries_.get(index);
     }
     /** repeated .ORSetDeltaGroup.Entry entries = 1; */
+    @java.lang.Override
     public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
             .EntryOrBuilder
         getEntriesOrBuilder(int index) {
@@ -4817,7 +4686,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < entries_.size(); i++) {
         output.writeMessage(1, entries_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -4831,7 +4700,7 @@ public int getSerializedSize() {
             org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
                 1, entries_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4854,7 +4723,7 @@ public boolean equals(final java.lang.Object obj) {
                   obj;
 
       if (!getEntriesList().equals(other.getEntriesList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -4869,7 +4738,7 @@ public int hashCode() {
         hash = (37 * hash) + ENTRIES_FIELD_NUMBER;
         hash = (53 * hash) + getEntriesList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -5027,31 +4896,24 @@ public static final class Builder
 
       // Construct using
       // org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getEntriesFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (entriesBuilder_ == null) {
           entries_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
+          entries_ = null;
           entriesBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -5089,7 +4951,17 @@ public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor
             result =
                 new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .ORSetDeltaGroup(this);
-        int from_bitField0_ = bitField0_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+              result) {
         if (entriesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             entries_ = java.util.Collections.unmodifiableList(entries_);
@@ -5099,8 +4971,12 @@ public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor
         } else {
           result.entries_ = entriesBuilder_.build();
         }
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+              result) {
+        int from_bitField0_ = bitField0_;
       }
 
       @java.lang.Override
@@ -5191,7 +5067,7 @@ public Builder mergeFrom(
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -5211,29 +5087,56 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-            parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                      .ORSetDeltaGroup)
-                  e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
         }
-        return this;
-      }
-
-      private int bitField0_;
-
-      private java.util.List<
-              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                  .ORSetDeltaGroup.Entry>
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                          .ORSetDeltaGroup.Entry
+                      m =
+                          input.readMessage(
+                              org.apache.pekko.persistence.typed.serialization
+                                  .ReplicatedEventSourcing.ORSetDeltaGroup.Entry.PARSER,
+                              extensionRegistry);
+                  if (entriesBuilder_ == null) {
+                    ensureEntriesIsMutable();
+                    entries_.add(m);
+                  } else {
+                    entriesBuilder_.addMessage(m);
+                  }
+                  break;
+                } // case 10
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.unwrapIOException();
+        } finally {
+          onChanged();
+        } // finally
+        return this;
+      }
+
+      private int bitField0_;
+
+      private java.util.List<
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ORSetDeltaGroup.Entry>
           entries_ = java.util.Collections.emptyList();
 
       private void ensureEntriesIsMutable() {
@@ -5537,7 +5440,19 @@ public ORSetDeltaGroup parsePartialFrom(
               org.apache.pekko.protobufv3.internal.CodedInputStream input,
               org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
               throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-            return new ORSetDeltaGroup(input, extensionRegistry);
+            Builder builder = newBuilder();
+            try {
+              builder.mergeFrom(input, extensionRegistry);
+            } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+              throw e.setUnfinishedMessage(builder.buildPartial());
+            } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+              throw e.asInvalidProtocolBufferException()
+                  .setUnfinishedMessage(builder.buildPartial());
+            } catch (java.io.IOException e) {
+              throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                  .setUnfinishedMessage(builder.buildPartial());
+            }
+            return builder.buildPartial();
           }
         };
 
@@ -5607,69 +5522,6 @@ protected java.lang.Object newInstance(
       return new VersionVector();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
-      return this.unknownFields;
-    }
-
-    private VersionVector(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                  entries_ =
-                      new java.util.ArrayList<
-                          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                              .VersionVector.Entry>();
-                  mutable_bitField0_ |= 0x00000001;
-                }
-                entries_.add(
-                    input.readMessage(
-                        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                            .VersionVector.Entry.PARSER,
-                        extensionRegistry));
-                break;
-              }
-            default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
-            .setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          entries_ = java.util.Collections.unmodifiableList(entries_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
@@ -5747,63 +5599,6 @@ protected java.lang.Object newInstance(
         return new Entry();
       }
 
-      @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
-        return this.unknownFields;
-      }
-
-      private Entry(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                  bitField0_ |= 0x00000001;
-                  key_ = bs;
-                  break;
-                }
-              case 16:
-                {
-                  bitField0_ |= 0x00000002;
-                  version_ = input.readInt64();
-                  break;
-                }
-              default:
-                {
-                  if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                    done = true;
-                  }
-                  break;
-                }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
-              .setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
-
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
@@ -5824,12 +5619,15 @@ private Entry(
 
       private int bitField0_;
       public static final int KEY_FIELD_NUMBER = 1;
-      private volatile java.lang.Object key_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object key_ = "";
       /**
        * required string key = 1;
        *
        * @return Whether the key field is set.
        */
+      @java.lang.Override
       public boolean hasKey() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -5838,6 +5636,7 @@ public boolean hasKey() {
        *
        * @return The key.
        */
+      @java.lang.Override
       public java.lang.String getKey() {
         java.lang.Object ref = key_;
         if (ref instanceof java.lang.String) {
@@ -5857,6 +5656,7 @@ public java.lang.String getKey() {
        *
        * @return The bytes for key.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getKeyBytes() {
         java.lang.Object ref = key_;
         if (ref instanceof java.lang.String) {
@@ -5870,12 +5670,13 @@ public org.apache.pekko.protobufv3.internal.ByteString getKeyBytes() {
       }
 
       public static final int VERSION_FIELD_NUMBER = 2;
-      private long version_;
+      private long version_ = 0L;
       /**
        * required int64 version = 2;
        *
        * @return Whether the version field is set.
        */
+      @java.lang.Override
       public boolean hasVersion() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -5884,6 +5685,7 @@ public boolean hasVersion() {
        *
        * @return The version.
        */
+      @java.lang.Override
       public long getVersion() {
         return version_;
       }
@@ -5917,7 +5719,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeInt64(2, version_);
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -5934,7 +5736,7 @@ public int getSerializedSize() {
           size +=
               org.apache.pekko.protobufv3.internal.CodedOutputStream.computeInt64Size(2, version_);
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -5964,7 +5766,7 @@ public boolean equals(final java.lang.Object obj) {
         if (hasVersion()) {
           if (getVersion() != other.getVersion()) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -5983,7 +5785,7 @@ public int hashCode() {
           hash = (37 * hash) + VERSION_FIELD_NUMBER;
           hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(getVersion());
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -6142,27 +5944,19 @@ public static final class Builder
 
         // Construct using
         // org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry.newBuilder()
-        private Builder() {
-          maybeForceBuilderInitialization();
-        }
+        private Builder() {}
 
         private Builder(
             org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
-          maybeForceBuilderInitialization();
-        }
-
-        private void maybeForceBuilderInitialization() {
-          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {}
         }
 
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           key_ = "";
-          bitField0_ = (bitField0_ & ~0x00000001);
           version_ = 0L;
-          bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
@@ -6202,19 +5996,28 @@ public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor
               result =
                   new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .VersionVector.Entry(this);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                    .Entry
+                result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.key_ = key_;
             to_bitField0_ |= 0x00000001;
           }
-          result.key_ = key_;
           if (((from_bitField0_ & 0x00000002) != 0)) {
             result.version_ = version_;
             to_bitField0_ |= 0x00000002;
           }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -6280,14 +6083,14 @@ public Builder mergeFrom(
               == org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .VersionVector.Entry.getDefaultInstance()) return this;
           if (other.hasKey()) {
-            bitField0_ |= 0x00000001;
             key_ = other.key_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (other.hasVersion()) {
             setVersion(other.getVersion());
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -6308,22 +6111,43 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                  .Entry
-              parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 10:
+                  {
+                    key_ = input.readBytes();
+                    bitField0_ |= 0x00000001;
+                    break;
+                  } // case 10
+                case 16:
+                  {
+                    version_ = input.readInt64();
+                    bitField0_ |= 0x00000002;
+                    break;
+                  } // case 16
+                default:
+                  {
+                    if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                      done = true; // was an endgroup tag
+                    }
+                    break;
+                  } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage =
-                (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                        .VersionVector.Entry)
-                    e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
 
@@ -6384,8 +6208,8 @@ public Builder setKey(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-          bitField0_ |= 0x00000001;
           key_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -6395,8 +6219,8 @@ public Builder setKey(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearKey() {
-          bitField0_ = (bitField0_ & ~0x00000001);
           key_ = getDefaultInstance().getKey();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -6410,8 +6234,8 @@ public Builder setKeyBytes(org.apache.pekko.protobufv3.internal.ByteString value
           if (value == null) {
             throw new NullPointerException();
           }
-          bitField0_ |= 0x00000001;
           key_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -6422,6 +6246,7 @@ public Builder setKeyBytes(org.apache.pekko.protobufv3.internal.ByteString value
          *
          * @return Whether the version field is set.
          */
+        @java.lang.Override
         public boolean hasVersion() {
           return ((bitField0_ & 0x00000002) != 0);
         }
@@ -6430,6 +6255,7 @@ public boolean hasVersion() {
          *
          * @return The version.
          */
+        @java.lang.Override
         public long getVersion() {
           return version_;
         }
@@ -6440,8 +6266,9 @@ public long getVersion() {
          * @return This builder for chaining.
          */
         public Builder setVersion(long value) {
-          bitField0_ |= 0x00000002;
+
           version_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -6497,7 +6324,19 @@ public Entry parsePartialFrom(
                 org.apache.pekko.protobufv3.internal.CodedInputStream input,
                 org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
                 throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-              return new Entry(input, extensionRegistry);
+              Builder builder = newBuilder();
+              try {
+                builder.mergeFrom(input, extensionRegistry);
+              } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+                throw e.setUnfinishedMessage(builder.buildPartial());
+              } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+                throw e.asInvalidProtocolBufferException()
+                    .setUnfinishedMessage(builder.buildPartial());
+              } catch (java.io.IOException e) {
+                throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                    .setUnfinishedMessage(builder.buildPartial());
+              }
+              return builder.buildPartial();
             }
           };
 
@@ -6519,11 +6358,14 @@ public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 1;
+
+    @SuppressWarnings("serial")
     private java.util.List<
             org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
                 .Entry>
         entries_;
     /** repeated .VersionVector.Entry entries = 1; */
+    @java.lang.Override
     public java.util.List<
             org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
                 .Entry>
@@ -6531,6 +6373,7 @@ public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return entries_;
     }
     /** repeated .VersionVector.Entry entries = 1; */
+    @java.lang.Override
     public java.util.List<
             ? extends
                 org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
@@ -6539,16 +6382,19 @@ public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return entries_;
     }
     /** repeated .VersionVector.Entry entries = 1; */
+    @java.lang.Override
     public int getEntriesCount() {
       return entries_.size();
     }
     /** repeated .VersionVector.Entry entries = 1; */
+    @java.lang.Override
     public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
             .Entry
         getEntries(int index) {
       return entries_.get(index);
     }
     /** repeated .VersionVector.Entry entries = 1; */
+    @java.lang.Override
     public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
             .EntryOrBuilder
         getEntriesOrBuilder(int index) {
@@ -6579,7 +6425,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < entries_.size(); i++) {
         output.writeMessage(1, entries_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -6593,7 +6439,7 @@ public int getSerializedSize() {
             org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
                 1, entries_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -6613,7 +6459,7 @@ public boolean equals(final java.lang.Object obj) {
               obj;
 
       if (!getEntriesList().equals(other.getEntriesList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -6628,7 +6474,7 @@ public int hashCode() {
         hash = (37 * hash) + ENTRIES_FIELD_NUMBER;
         hash = (53 * hash) + getEntriesList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -6786,31 +6632,24 @@ public static final class Builder
 
       // Construct using
       // org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getEntriesFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (entriesBuilder_ == null) {
           entries_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
+          entries_ = null;
           entriesBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -6845,7 +6684,17 @@ public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor
             result =
                 new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .VersionVector(this);
-        int from_bitField0_ = bitField0_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              result) {
         if (entriesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             entries_ = java.util.Collections.unmodifiableList(entries_);
@@ -6855,8 +6704,12 @@ public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor
         } else {
           result.entries_ = entriesBuilder_.build();
         }
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              result) {
+        int from_bitField0_ = bitField0_;
       }
 
       @java.lang.Override
@@ -6947,7 +6800,7 @@ public Builder mergeFrom(
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -6967,21 +6820,48 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-            parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                          .VersionVector.Entry
+                      m =
+                          input.readMessage(
+                              org.apache.pekko.persistence.typed.serialization
+                                  .ReplicatedEventSourcing.VersionVector.Entry.PARSER,
+                              extensionRegistry);
+                  if (entriesBuilder_ == null) {
+                    ensureEntriesIsMutable();
+                    entries_.add(m);
+                  } else {
+                    entriesBuilder_.addMessage(m);
+                  }
+                  break;
+                } // case 10
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                      .VersionVector)
-                  e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
 
@@ -7293,7 +7173,19 @@ public VersionVector parsePartialFrom(
               org.apache.pekko.protobufv3.internal.CodedInputStream input,
               org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
               throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-            return new VersionVector(input, extensionRegistry);
+            Builder builder = newBuilder();
+            try {
+              builder.mergeFrom(input, extensionRegistry);
+            } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+              throw e.setUnfinishedMessage(builder.buildPartial());
+            } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+              throw e.asInvalidProtocolBufferException()
+                  .setUnfinishedMessage(builder.buildPartial());
+            } catch (java.io.IOException e) {
+              throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                  .setUnfinishedMessage(builder.buildPartial());
+            }
+            return builder.buildPartial();
           }
         };
 
@@ -7404,89 +7296,6 @@ protected java.lang.Object newInstance(
       return new ReplicatedEventMetadata();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
-      return this.unknownFields;
-    }
-
-    private ReplicatedEventMetadata(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000001;
-                originReplica_ = bs;
-                break;
-              }
-            case 16:
-              {
-                bitField0_ |= 0x00000002;
-                originSequenceNr_ = input.readInt64();
-                break;
-              }
-            case 26:
-              {
-                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                        .VersionVector.Builder
-                    subBuilder = null;
-                if (((bitField0_ & 0x00000004) != 0)) {
-                  subBuilder = versionVector_.toBuilder();
-                }
-                versionVector_ =
-                    input.readMessage(
-                        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                            .VersionVector.PARSER,
-                        extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(versionVector_);
-                  versionVector_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000004;
-                break;
-              }
-            case 32:
-              {
-                bitField0_ |= 0x00000008;
-                concurrent_ = input.readBool();
-                break;
-              }
-            default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
-            .setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
@@ -7507,12 +7316,15 @@ private ReplicatedEventMetadata(
 
     private int bitField0_;
     public static final int ORIGINREPLICA_FIELD_NUMBER = 1;
-    private volatile java.lang.Object originReplica_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object originReplica_ = "";
     /**
      * required string originReplica = 1;
      *
      * @return Whether the originReplica field is set.
      */
+    @java.lang.Override
     public boolean hasOriginReplica() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -7521,6 +7333,7 @@ public boolean hasOriginReplica() {
      *
      * @return The originReplica.
      */
+    @java.lang.Override
     public java.lang.String getOriginReplica() {
       java.lang.Object ref = originReplica_;
       if (ref instanceof java.lang.String) {
@@ -7540,6 +7353,7 @@ public java.lang.String getOriginReplica() {
      *
      * @return The bytes for originReplica.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getOriginReplicaBytes() {
       java.lang.Object ref = originReplica_;
       if (ref instanceof java.lang.String) {
@@ -7553,12 +7367,13 @@ public org.apache.pekko.protobufv3.internal.ByteString getOriginReplicaBytes() {
     }
 
     public static final int ORIGINSEQUENCENR_FIELD_NUMBER = 2;
-    private long originSequenceNr_;
+    private long originSequenceNr_ = 0L;
     /**
      * required int64 originSequenceNr = 2;
      *
      * @return Whether the originSequenceNr field is set.
      */
+    @java.lang.Override
     public boolean hasOriginSequenceNr() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -7567,6 +7382,7 @@ public boolean hasOriginSequenceNr() {
      *
      * @return The originSequenceNr.
      */
+    @java.lang.Override
     public long getOriginSequenceNr() {
       return originSequenceNr_;
     }
@@ -7579,6 +7395,7 @@ public long getOriginSequenceNr() {
      *
      * @return Whether the versionVector field is set.
      */
+    @java.lang.Override
     public boolean hasVersionVector() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -7587,6 +7404,7 @@ public boolean hasVersionVector() {
      *
      * @return The versionVector.
      */
+    @java.lang.Override
     public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
         getVersionVector() {
       return versionVector_ == null
@@ -7595,6 +7413,7 @@ public boolean hasVersionVector() {
           : versionVector_;
     }
     /** required .VersionVector versionVector = 3; */
+    @java.lang.Override
     public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .VersionVectorOrBuilder
         getVersionVectorOrBuilder() {
@@ -7605,12 +7424,13 @@ public boolean hasVersionVector() {
     }
 
     public static final int CONCURRENT_FIELD_NUMBER = 4;
-    private boolean concurrent_;
+    private boolean concurrent_ = false;
     /**
      * required bool concurrent = 4;
      *
      * @return Whether the concurrent field is set.
      */
+    @java.lang.Override
     public boolean hasConcurrent() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -7619,6 +7439,7 @@ public boolean hasConcurrent() {
      *
      * @return The concurrent.
      */
+    @java.lang.Override
     public boolean getConcurrent() {
       return concurrent_;
     }
@@ -7671,7 +7492,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeBool(4, concurrent_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -7699,7 +7520,7 @@ public int getSerializedSize() {
         size +=
             org.apache.pekko.protobufv3.internal.CodedOutputStream.computeBoolSize(4, concurrent_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -7738,7 +7559,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasConcurrent()) {
         if (getConcurrent() != other.getConcurrent()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -7769,7 +7590,7 @@ public int hashCode() {
             (53 * hash)
                 + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(getConcurrent());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -7947,18 +7768,15 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         originReplica_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         originSequenceNr_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        if (versionVectorBuilder_ == null) {
-          versionVector_ = null;
-        } else {
-          versionVectorBuilder_.clear();
+        versionVector_ = null;
+        if (versionVectorBuilder_ != null) {
+          versionVectorBuilder_.dispose();
+          versionVectorBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000004);
         concurrent_ = false;
-        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -7998,31 +7816,37 @@ public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor
             result =
                 new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .ReplicatedEventMetadata(this);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ReplicatedEventMetadata
+              result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.originReplica_ = originReplica_;
           to_bitField0_ |= 0x00000001;
         }
-        result.originReplica_ = originReplica_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.originSequenceNr_ = originSequenceNr_;
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
-          if (versionVectorBuilder_ == null) {
-            result.versionVector_ = versionVector_;
-          } else {
-            result.versionVector_ = versionVectorBuilder_.build();
-          }
+          result.versionVector_ =
+              versionVectorBuilder_ == null ? versionVector_ : versionVectorBuilder_.build();
           to_bitField0_ |= 0x00000004;
         }
         if (((from_bitField0_ & 0x00000008) != 0)) {
           result.concurrent_ = concurrent_;
           to_bitField0_ |= 0x00000008;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -8088,8 +7912,8 @@ public Builder mergeFrom(
             == org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                 .ReplicatedEventMetadata.getDefaultInstance()) return this;
         if (other.hasOriginReplica()) {
-          bitField0_ |= 0x00000001;
           originReplica_ = other.originReplica_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasOriginSequenceNr()) {
@@ -8101,7 +7925,7 @@ public Builder mergeFrom(
         if (other.hasConcurrent()) {
           setConcurrent(other.getConcurrent());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -8131,22 +7955,55 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                .ReplicatedEventMetadata
-            parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                      .ReplicatedEventMetadata)
-                  e.getUnfinishedMessage();
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  originReplica_ = input.readBytes();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+              case 16:
+                {
+                  originSequenceNr_ = input.readInt64();
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 16
+              case 26:
+                {
+                  input.readMessage(getVersionVectorFieldBuilder().getBuilder(), extensionRegistry);
+                  bitField0_ |= 0x00000004;
+                  break;
+                } // case 26
+              case 32:
+                {
+                  concurrent_ = input.readBool();
+                  bitField0_ |= 0x00000008;
+                  break;
+                } // case 32
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
 
@@ -8206,8 +8063,8 @@ public Builder setOriginReplica(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000001;
         originReplica_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8217,8 +8074,8 @@ public Builder setOriginReplica(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearOriginReplica() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         originReplica_ = getDefaultInstance().getOriginReplica();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -8232,8 +8089,8 @@ public Builder setOriginReplicaBytes(org.apache.pekko.protobufv3.internal.ByteSt
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000001;
         originReplica_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8244,6 +8101,7 @@ public Builder setOriginReplicaBytes(org.apache.pekko.protobufv3.internal.ByteSt
        *
        * @return Whether the originSequenceNr field is set.
        */
+      @java.lang.Override
       public boolean hasOriginSequenceNr() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -8252,6 +8110,7 @@ public boolean hasOriginSequenceNr() {
        *
        * @return The originSequenceNr.
        */
+      @java.lang.Override
       public long getOriginSequenceNr() {
         return originSequenceNr_;
       }
@@ -8262,8 +8121,9 @@ public long getOriginSequenceNr() {
        * @return This builder for chaining.
        */
       public Builder setOriginSequenceNr(long value) {
-        bitField0_ |= 0x00000002;
+
         originSequenceNr_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -8322,11 +8182,11 @@ public Builder setVersionVector(
             throw new NullPointerException();
           }
           versionVector_ = value;
-          onChanged();
         } else {
           versionVectorBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /** required .VersionVector versionVector = 3; */
@@ -8336,11 +8196,11 @@ public Builder setVersionVector(
               builderForValue) {
         if (versionVectorBuilder_ == null) {
           versionVector_ = builderForValue.build();
-          onChanged();
         } else {
           versionVectorBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /** required .VersionVector versionVector = 3; */
@@ -8353,30 +8213,28 @@ public Builder mergeVersionVector(
               && versionVector_
                   != org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .VersionVector.getDefaultInstance()) {
-            versionVector_ =
-                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                    .VersionVector.newBuilder(versionVector_)
-                    .mergeFrom(value)
-                    .buildPartial();
+            getVersionVectorBuilder().mergeFrom(value);
           } else {
             versionVector_ = value;
           }
-          onChanged();
         } else {
           versionVectorBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000004;
+        if (versionVector_ != null) {
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
         return this;
       }
       /** required .VersionVector versionVector = 3; */
       public Builder clearVersionVector() {
-        if (versionVectorBuilder_ == null) {
-          versionVector_ = null;
-          onChanged();
-        } else {
-          versionVectorBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000004);
+        versionVector_ = null;
+        if (versionVectorBuilder_ != null) {
+          versionVectorBuilder_.dispose();
+          versionVectorBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /** required .VersionVector versionVector = 3; */
@@ -8430,6 +8288,7 @@ public Builder clearVersionVector() {
        *
        * @return Whether the concurrent field is set.
        */
+      @java.lang.Override
       public boolean hasConcurrent() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -8438,6 +8297,7 @@ public boolean hasConcurrent() {
        *
        * @return The concurrent.
        */
+      @java.lang.Override
       public boolean getConcurrent() {
         return concurrent_;
       }
@@ -8448,8 +8308,9 @@ public boolean getConcurrent() {
        * @return This builder for chaining.
        */
       public Builder setConcurrent(boolean value) {
-        bitField0_ |= 0x00000008;
+
         concurrent_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -8506,7 +8367,19 @@ public ReplicatedEventMetadata parsePartialFrom(
                   org.apache.pekko.protobufv3.internal.CodedInputStream input,
                   org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
                   throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-                return new ReplicatedEventMetadata(input, extensionRegistry);
+                Builder builder = newBuilder();
+                try {
+                  builder.mergeFrom(input, extensionRegistry);
+                } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+                  throw e.setUnfinishedMessage(builder.buildPartial());
+                } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+                  throw e.asInvalidProtocolBufferException()
+                      .setUnfinishedMessage(builder.buildPartial());
+                } catch (java.io.IOException e) {
+                  throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                      .setUnfinishedMessage(builder.buildPartial());
+                }
+                return builder.buildPartial();
               }
             };
 
@@ -8595,89 +8468,6 @@ protected java.lang.Object newInstance(
       return new ReplicatedSnapshotMetadata();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
-      return this.unknownFields;
-    }
-
-    private ReplicatedSnapshotMetadata(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                        .VersionVector.Builder
-                    subBuilder = null;
-                if (((bitField0_ & 0x00000001) != 0)) {
-                  subBuilder = version_.toBuilder();
-                }
-                version_ =
-                    input.readMessage(
-                        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                            .VersionVector.PARSER,
-                        extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(version_);
-                  version_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000001;
-                break;
-              }
-            case 18:
-              {
-                if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                  seenPerReplica_ =
-                      new java.util.ArrayList<
-                          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                              .ReplicatedSnapshotMetadata.Seen>();
-                  mutable_bitField0_ |= 0x00000002;
-                }
-                seenPerReplica_.add(
-                    input.readMessage(
-                        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                            .ReplicatedSnapshotMetadata.Seen.PARSER,
-                        extensionRegistry));
-                break;
-              }
-            default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
-            .setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          seenPerReplica_ = java.util.Collections.unmodifiableList(seenPerReplica_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
@@ -8755,63 +8545,6 @@ protected java.lang.Object newInstance(
         return new Seen();
       }
 
-      @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
-        return this.unknownFields;
-      }
-
-      private Seen(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                  bitField0_ |= 0x00000001;
-                  replicaId_ = bs;
-                  break;
-                }
-              case 16:
-                {
-                  bitField0_ |= 0x00000002;
-                  sequenceNr_ = input.readInt64();
-                  break;
-                }
-              default:
-                {
-                  if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                    done = true;
-                  }
-                  break;
-                }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
-              .setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
-
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
@@ -8832,12 +8565,15 @@ private Seen(
 
       private int bitField0_;
       public static final int REPLICAID_FIELD_NUMBER = 1;
-      private volatile java.lang.Object replicaId_;
+
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object replicaId_ = "";
       /**
        * required string replicaId = 1;
        *
        * @return Whether the replicaId field is set.
        */
+      @java.lang.Override
       public boolean hasReplicaId() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -8846,6 +8582,7 @@ public boolean hasReplicaId() {
        *
        * @return The replicaId.
        */
+      @java.lang.Override
       public java.lang.String getReplicaId() {
         java.lang.Object ref = replicaId_;
         if (ref instanceof java.lang.String) {
@@ -8865,6 +8602,7 @@ public java.lang.String getReplicaId() {
        *
        * @return The bytes for replicaId.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getReplicaIdBytes() {
         java.lang.Object ref = replicaId_;
         if (ref instanceof java.lang.String) {
@@ -8878,12 +8616,13 @@ public org.apache.pekko.protobufv3.internal.ByteString getReplicaIdBytes() {
       }
 
       public static final int SEQUENCENR_FIELD_NUMBER = 2;
-      private long sequenceNr_;
+      private long sequenceNr_ = 0L;
       /**
        * required int64 sequenceNr = 2;
        *
        * @return Whether the sequenceNr field is set.
        */
+      @java.lang.Override
       public boolean hasSequenceNr() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -8892,6 +8631,7 @@ public boolean hasSequenceNr() {
        *
        * @return The sequenceNr.
        */
+      @java.lang.Override
       public long getSequenceNr() {
         return sequenceNr_;
       }
@@ -8926,7 +8666,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeInt64(2, sequenceNr_);
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -8945,7 +8685,7 @@ public int getSerializedSize() {
               org.apache.pekko.protobufv3.internal.CodedOutputStream.computeInt64Size(
                   2, sequenceNr_);
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -8976,7 +8716,7 @@ public boolean equals(final java.lang.Object obj) {
         if (hasSequenceNr()) {
           if (getSequenceNr() != other.getSequenceNr()) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -8996,7 +8736,7 @@ public int hashCode() {
           hash =
               (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(getSequenceNr());
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -9155,27 +8895,19 @@ public static final class Builder
 
         // Construct using
         // org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata.Seen.newBuilder()
-        private Builder() {
-          maybeForceBuilderInitialization();
-        }
+        private Builder() {}
 
         private Builder(
             org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
-          maybeForceBuilderInitialization();
-        }
-
-        private void maybeForceBuilderInitialization() {
-          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {}
         }
 
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           replicaId_ = "";
-          bitField0_ = (bitField0_ & ~0x00000001);
           sequenceNr_ = 0L;
-          bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
@@ -9215,19 +8947,28 @@ public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor
               result =
                   new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ReplicatedSnapshotMetadata.Seen(this);
+          if (bitField0_ != 0) {
+            buildPartial0(result);
+          }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .ReplicatedSnapshotMetadata.Seen
+                result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.replicaId_ = replicaId_;
             to_bitField0_ |= 0x00000001;
           }
-          result.replicaId_ = replicaId_;
           if (((from_bitField0_ & 0x00000002) != 0)) {
             result.sequenceNr_ = sequenceNr_;
             to_bitField0_ |= 0x00000002;
           }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -9293,14 +9034,14 @@ public Builder mergeFrom(
               == org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedSnapshotMetadata.Seen.getDefaultInstance()) return this;
           if (other.hasReplicaId()) {
-            bitField0_ |= 0x00000001;
             replicaId_ = other.replicaId_;
+            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (other.hasSequenceNr()) {
             setSequenceNr(other.getSequenceNr());
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -9321,22 +9062,43 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                  .ReplicatedSnapshotMetadata.Seen
-              parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 10:
+                  {
+                    replicaId_ = input.readBytes();
+                    bitField0_ |= 0x00000001;
+                    break;
+                  } // case 10
+                case 16:
+                  {
+                    sequenceNr_ = input.readInt64();
+                    bitField0_ |= 0x00000002;
+                    break;
+                  } // case 16
+                default:
+                  {
+                    if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                      done = true; // was an endgroup tag
+                    }
+                    break;
+                  } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage =
-                (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                        .ReplicatedSnapshotMetadata.Seen)
-                    e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
 
@@ -9397,8 +9159,8 @@ public Builder setReplicaId(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
-          bitField0_ |= 0x00000001;
           replicaId_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -9408,8 +9170,8 @@ public Builder setReplicaId(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearReplicaId() {
-          bitField0_ = (bitField0_ & ~0x00000001);
           replicaId_ = getDefaultInstance().getReplicaId();
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -9423,8 +9185,8 @@ public Builder setReplicaIdBytes(org.apache.pekko.protobufv3.internal.ByteString
           if (value == null) {
             throw new NullPointerException();
           }
-          bitField0_ |= 0x00000001;
           replicaId_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -9435,6 +9197,7 @@ public Builder setReplicaIdBytes(org.apache.pekko.protobufv3.internal.ByteString
          *
          * @return Whether the sequenceNr field is set.
          */
+        @java.lang.Override
         public boolean hasSequenceNr() {
           return ((bitField0_ & 0x00000002) != 0);
         }
@@ -9443,6 +9206,7 @@ public boolean hasSequenceNr() {
          *
          * @return The sequenceNr.
          */
+        @java.lang.Override
         public long getSequenceNr() {
           return sequenceNr_;
         }
@@ -9453,8 +9217,9 @@ public long getSequenceNr() {
          * @return This builder for chaining.
          */
         public Builder setSequenceNr(long value) {
-          bitField0_ |= 0x00000002;
+
           sequenceNr_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -9510,7 +9275,19 @@ public Seen parsePartialFrom(
                 org.apache.pekko.protobufv3.internal.CodedInputStream input,
                 org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
                 throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-              return new Seen(input, extensionRegistry);
+              Builder builder = newBuilder();
+              try {
+                builder.mergeFrom(input, extensionRegistry);
+              } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+                throw e.setUnfinishedMessage(builder.buildPartial());
+              } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+                throw e.asInvalidProtocolBufferException()
+                    .setUnfinishedMessage(builder.buildPartial());
+              } catch (java.io.IOException e) {
+                throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                    .setUnfinishedMessage(builder.buildPartial());
+              }
+              return builder.buildPartial();
             }
           };
 
@@ -9540,6 +9317,7 @@ public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
      *
      * @return Whether the version field is set.
      */
+    @java.lang.Override
     public boolean hasVersion() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -9548,6 +9326,7 @@ public boolean hasVersion() {
      *
      * @return The version.
      */
+    @java.lang.Override
     public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
         getVersion() {
       return version_ == null
@@ -9556,6 +9335,7 @@ public boolean hasVersion() {
           : version_;
     }
     /** required .VersionVector version = 1; */
+    @java.lang.Override
     public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .VersionVectorOrBuilder
         getVersionOrBuilder() {
@@ -9566,11 +9346,14 @@ public boolean hasVersion() {
     }
 
     public static final int SEENPERREPLICA_FIELD_NUMBER = 2;
+
+    @SuppressWarnings("serial")
     private java.util.List<
             org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                 .ReplicatedSnapshotMetadata.Seen>
         seenPerReplica_;
     /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
+    @java.lang.Override
     public java.util.List<
             org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                 .ReplicatedSnapshotMetadata.Seen>
@@ -9578,6 +9361,7 @@ public boolean hasVersion() {
       return seenPerReplica_;
     }
     /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
+    @java.lang.Override
     public java.util.List<
             ? extends
                 org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
@@ -9586,16 +9370,19 @@ public boolean hasVersion() {
       return seenPerReplica_;
     }
     /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
+    @java.lang.Override
     public int getSeenPerReplicaCount() {
       return seenPerReplica_.size();
     }
     /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
+    @java.lang.Override
     public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedSnapshotMetadata.Seen
         getSeenPerReplica(int index) {
       return seenPerReplica_.get(index);
     }
     /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
+    @java.lang.Override
     public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedSnapshotMetadata.SeenOrBuilder
         getSeenPerReplicaOrBuilder(int index) {
@@ -9637,7 +9424,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < seenPerReplica_.size(); i++) {
         output.writeMessage(2, seenPerReplica_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -9656,7 +9443,7 @@ public int getSerializedSize() {
             org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
                 2, seenPerReplica_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -9684,7 +9471,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getVersion().equals(other.getVersion())) return false;
       }
       if (!getSeenPerReplicaList().equals(other.getSeenPerReplicaList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -9703,7 +9490,7 @@ public int hashCode() {
         hash = (37 * hash) + SEENPERREPLICA_FIELD_NUMBER;
         hash = (53 * hash) + getSeenPerReplicaList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -9882,18 +9669,19 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (versionBuilder_ == null) {
-          version_ = null;
-        } else {
-          versionBuilder_.clear();
+        bitField0_ = 0;
+        version_ = null;
+        if (versionBuilder_ != null) {
+          versionBuilder_.dispose();
+          versionBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         if (seenPerReplicaBuilder_ == null) {
           seenPerReplica_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
+          seenPerReplica_ = null;
           seenPerReplicaBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -9933,16 +9721,18 @@ public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor
             result =
                 new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .ReplicatedSnapshotMetadata(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (versionBuilder_ == null) {
-            result.version_ = version_;
-          } else {
-            result.version_ = versionBuilder_.build();
-          }
-          to_bitField0_ |= 0x00000001;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
         }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ReplicatedSnapshotMetadata
+              result) {
         if (seenPerReplicaBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
             seenPerReplica_ = java.util.Collections.unmodifiableList(seenPerReplica_);
@@ -9952,9 +9742,19 @@ public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor
         } else {
           result.seenPerReplica_ = seenPerReplicaBuilder_.build();
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ReplicatedSnapshotMetadata
+              result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.version_ = versionBuilder_ == null ? version_ : versionBuilder_.build();
+          to_bitField0_ |= 0x00000001;
+        }
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -10049,7 +9849,7 @@ public Builder mergeFrom(
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -10075,22 +9875,54 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                .ReplicatedSnapshotMetadata
-            parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  input.readMessage(getVersionFieldBuilder().getBuilder(), extensionRegistry);
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+              case 18:
+                {
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                          .ReplicatedSnapshotMetadata.Seen
+                      m =
+                          input.readMessage(
+                              org.apache.pekko.persistence.typed.serialization
+                                  .ReplicatedEventSourcing.ReplicatedSnapshotMetadata.Seen.PARSER,
+                              extensionRegistry);
+                  if (seenPerReplicaBuilder_ == null) {
+                    ensureSeenPerReplicaIsMutable();
+                    seenPerReplica_.add(m);
+                  } else {
+                    seenPerReplicaBuilder_.addMessage(m);
+                  }
+                  break;
+                } // case 18
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                      .ReplicatedSnapshotMetadata)
-                  e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
 
@@ -10139,11 +9971,11 @@ public Builder setVersion(
             throw new NullPointerException();
           }
           version_ = value;
-          onChanged();
         } else {
           versionBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /** required .VersionVector version = 1; */
@@ -10153,11 +9985,11 @@ public Builder setVersion(
               builderForValue) {
         if (versionBuilder_ == null) {
           version_ = builderForValue.build();
-          onChanged();
         } else {
           versionBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /** required .VersionVector version = 1; */
@@ -10170,30 +10002,28 @@ public Builder mergeVersion(
               && version_
                   != org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .VersionVector.getDefaultInstance()) {
-            version_ =
-                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                    .VersionVector.newBuilder(version_)
-                    .mergeFrom(value)
-                    .buildPartial();
+            getVersionBuilder().mergeFrom(value);
           } else {
             version_ = value;
           }
-          onChanged();
         } else {
           versionBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (version_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /** required .VersionVector version = 1; */
       public Builder clearVersion() {
-        if (versionBuilder_ == null) {
-          version_ = null;
-          onChanged();
-        } else {
-          versionBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        version_ = null;
+        if (versionBuilder_ != null) {
+          versionBuilder_.dispose();
+          versionBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /** required .VersionVector version = 1; */
@@ -10551,7 +10381,19 @@ public ReplicatedSnapshotMetadata parsePartialFrom(
                   org.apache.pekko.protobufv3.internal.CodedInputStream input,
                   org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
                   throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-                return new ReplicatedSnapshotMetadata(input, extensionRegistry);
+                Builder builder = newBuilder();
+                try {
+                  builder.mergeFrom(input, extensionRegistry);
+                } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+                  throw e.setUnfinishedMessage(builder.buildPartial());
+                } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+                  throw e.asInvalidProtocolBufferException()
+                      .setUnfinishedMessage(builder.buildPartial());
+                } catch (java.io.IOException e) {
+                  throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                      .setUnfinishedMessage(builder.buildPartial());
+                }
+                return builder.buildPartial();
               }
             };
 
@@ -10617,96 +10459,25 @@ public interface ReplicatedPublishedEventMetaDataOrBuilder
   /** Protobuf type {@code ReplicatedPublishedEventMetaData} */
   public static final class ReplicatedPublishedEventMetaData
       extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-      implements
-      // @@protoc_insertion_point(message_implements:ReplicatedPublishedEventMetaData)
-      ReplicatedPublishedEventMetaDataOrBuilder {
-    private static final long serialVersionUID = 0L;
-    // Use ReplicatedPublishedEventMetaData.newBuilder() to construct.
-    private ReplicatedPublishedEventMetaData(
-        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-
-    private ReplicatedPublishedEventMetaData() {
-      replicaId_ = "";
-    }
-
-    @java.lang.Override
-    @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(
-        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
-      return new ReplicatedPublishedEventMetaData();
-    }
-
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
-      return this.unknownFields;
-    }
-
-    private ReplicatedPublishedEventMetaData(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000001;
-                replicaId_ = bs;
-                break;
-              }
-            case 18:
-              {
-                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                        .VersionVector.Builder
-                    subBuilder = null;
-                if (((bitField0_ & 0x00000002) != 0)) {
-                  subBuilder = versionVector_.toBuilder();
-                }
-                versionVector_ =
-                    input.readMessage(
-                        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                            .VersionVector.PARSER,
-                        extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(versionVector_);
-                  versionVector_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000002;
-                break;
-              }
-            default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
-            .setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
+      implements
+      // @@protoc_insertion_point(message_implements:ReplicatedPublishedEventMetaData)
+      ReplicatedPublishedEventMetaDataOrBuilder {
+    private static final long serialVersionUID = 0L;
+    // Use ReplicatedPublishedEventMetaData.newBuilder() to construct.
+    private ReplicatedPublishedEventMetaData(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      super(builder);
+    }
+
+    private ReplicatedPublishedEventMetaData() {
+      replicaId_ = "";
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+      return new ReplicatedPublishedEventMetaData();
     }
 
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
@@ -10729,12 +10500,15 @@ private ReplicatedPublishedEventMetaData(
 
     private int bitField0_;
     public static final int REPLICAID_FIELD_NUMBER = 1;
-    private volatile java.lang.Object replicaId_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object replicaId_ = "";
     /**
      * optional string replicaId = 1;
      *
      * @return Whether the replicaId field is set.
      */
+    @java.lang.Override
     public boolean hasReplicaId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -10743,6 +10517,7 @@ public boolean hasReplicaId() {
      *
      * @return The replicaId.
      */
+    @java.lang.Override
     public java.lang.String getReplicaId() {
       java.lang.Object ref = replicaId_;
       if (ref instanceof java.lang.String) {
@@ -10762,6 +10537,7 @@ public java.lang.String getReplicaId() {
      *
      * @return The bytes for replicaId.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getReplicaIdBytes() {
       java.lang.Object ref = replicaId_;
       if (ref instanceof java.lang.String) {
@@ -10782,6 +10558,7 @@ public org.apache.pekko.protobufv3.internal.ByteString getReplicaIdBytes() {
      *
      * @return Whether the versionVector field is set.
      */
+    @java.lang.Override
     public boolean hasVersionVector() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -10790,6 +10567,7 @@ public boolean hasVersionVector() {
      *
      * @return The versionVector.
      */
+    @java.lang.Override
     public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
         getVersionVector() {
       return versionVector_ == null
@@ -10798,6 +10576,7 @@ public boolean hasVersionVector() {
           : versionVector_;
     }
     /** optional .VersionVector versionVector = 2; */
+    @java.lang.Override
     public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .VersionVectorOrBuilder
         getVersionVectorOrBuilder() {
@@ -10834,7 +10613,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getVersionVector());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -10853,7 +10632,7 @@ public int getSerializedSize() {
             org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
                 2, getVersionVector());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -10884,7 +10663,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasVersionVector()) {
         if (!getVersionVector().equals(other.getVersionVector())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -10903,7 +10682,7 @@ public int hashCode() {
         hash = (37 * hash) + VERSIONVECTOR_FIELD_NUMBER;
         hash = (53 * hash) + getVersionVector().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -11081,14 +10860,13 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         replicaId_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (versionVectorBuilder_ == null) {
-          versionVector_ = null;
-        } else {
-          versionVectorBuilder_.clear();
+        versionVector_ = null;
+        if (versionVectorBuilder_ != null) {
+          versionVectorBuilder_.dispose();
+          versionVectorBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -11128,23 +10906,29 @@ public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor
             result =
                 new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .ReplicatedPublishedEventMetaData(this);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ReplicatedPublishedEventMetaData
+              result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.replicaId_ = replicaId_;
           to_bitField0_ |= 0x00000001;
         }
-        result.replicaId_ = replicaId_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (versionVectorBuilder_ == null) {
-            result.versionVector_ = versionVector_;
-          } else {
-            result.versionVector_ = versionVectorBuilder_.build();
-          }
+          result.versionVector_ =
+              versionVectorBuilder_ == null ? versionVector_ : versionVectorBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -11210,14 +10994,14 @@ public Builder mergeFrom(
             == org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                 .ReplicatedPublishedEventMetaData.getDefaultInstance()) return this;
         if (other.hasReplicaId()) {
-          bitField0_ |= 0x00000001;
           replicaId_ = other.replicaId_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasVersionVector()) {
           mergeVersionVector(other.getVersionVector());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -11237,22 +11021,43 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                .ReplicatedPublishedEventMetaData
-            parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  replicaId_ = input.readBytes();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+              case 18:
+                {
+                  input.readMessage(getVersionVectorFieldBuilder().getBuilder(), extensionRegistry);
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                      .ReplicatedPublishedEventMetaData)
-                  e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
 
@@ -11312,8 +11117,8 @@ public Builder setReplicaId(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000001;
         replicaId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -11323,8 +11128,8 @@ public Builder setReplicaId(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearReplicaId() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         replicaId_ = getDefaultInstance().getReplicaId();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -11338,8 +11143,8 @@ public Builder setReplicaIdBytes(org.apache.pekko.protobufv3.internal.ByteString
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000001;
         replicaId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -11387,11 +11192,11 @@ public Builder setVersionVector(
             throw new NullPointerException();
           }
           versionVector_ = value;
-          onChanged();
         } else {
           versionVectorBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /** optional .VersionVector versionVector = 2; */
@@ -11401,11 +11206,11 @@ public Builder setVersionVector(
               builderForValue) {
         if (versionVectorBuilder_ == null) {
           versionVector_ = builderForValue.build();
-          onChanged();
         } else {
           versionVectorBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /** optional .VersionVector versionVector = 2; */
@@ -11418,30 +11223,28 @@ public Builder mergeVersionVector(
               && versionVector_
                   != org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .VersionVector.getDefaultInstance()) {
-            versionVector_ =
-                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                    .VersionVector.newBuilder(versionVector_)
-                    .mergeFrom(value)
-                    .buildPartial();
+            getVersionVectorBuilder().mergeFrom(value);
           } else {
             versionVector_ = value;
           }
-          onChanged();
         } else {
           versionVectorBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (versionVector_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /** optional .VersionVector versionVector = 2; */
       public Builder clearVersionVector() {
-        if (versionVectorBuilder_ == null) {
-          versionVector_ = null;
-          onChanged();
-        } else {
-          versionVectorBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        versionVector_ = null;
+        if (versionVectorBuilder_ != null) {
+          versionVectorBuilder_.dispose();
+          versionVectorBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /** optional .VersionVector versionVector = 2; */
@@ -11532,7 +11335,19 @@ public ReplicatedPublishedEventMetaData parsePartialFrom(
                   org.apache.pekko.protobufv3.internal.CodedInputStream input,
                   org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
                   throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-                return new ReplicatedPublishedEventMetaData(input, extensionRegistry);
+                Builder builder = newBuilder();
+                try {
+                  builder.mergeFrom(input, extensionRegistry);
+                } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+                  throw e.setUnfinishedMessage(builder.buildPartial());
+                } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+                  throw e.asInvalidProtocolBufferException()
+                      .setUnfinishedMessage(builder.buildPartial());
+                } catch (java.io.IOException e) {
+                  throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                      .setUnfinishedMessage(builder.buildPartial());
+                }
+                return builder.buildPartial();
               }
             };
 
@@ -11663,105 +11478,6 @@ protected java.lang.Object newInstance(
       return new PublishedEvent();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
-      return this.unknownFields;
-    }
-
-    private PublishedEvent(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000001;
-                persistenceId_ = bs;
-                break;
-              }
-            case 16:
-              {
-                bitField0_ |= 0x00000002;
-                sequenceNr_ = input.readInt64();
-                break;
-              }
-            case 26:
-              {
-                org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000004) != 0)) {
-                  subBuilder = payload_.toBuilder();
-                }
-                payload_ =
-                    input.readMessage(
-                        org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(payload_);
-                  payload_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000004;
-                break;
-              }
-            case 32:
-              {
-                bitField0_ |= 0x00000008;
-                timestamp_ = input.readInt64();
-                break;
-              }
-            case 42:
-              {
-                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                        .ReplicatedPublishedEventMetaData.Builder
-                    subBuilder = null;
-                if (((bitField0_ & 0x00000010) != 0)) {
-                  subBuilder = metadata_.toBuilder();
-                }
-                metadata_ =
-                    input.readMessage(
-                        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                            .ReplicatedPublishedEventMetaData.PARSER,
-                        extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(metadata_);
-                  metadata_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000010;
-                break;
-              }
-            default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
-            .setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
@@ -11782,12 +11498,15 @@ private PublishedEvent(
 
     private int bitField0_;
     public static final int PERSISTENCEID_FIELD_NUMBER = 1;
-    private volatile java.lang.Object persistenceId_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object persistenceId_ = "";
     /**
      * optional string persistenceId = 1;
      *
      * @return Whether the persistenceId field is set.
      */
+    @java.lang.Override
     public boolean hasPersistenceId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -11796,6 +11515,7 @@ public boolean hasPersistenceId() {
      *
      * @return The persistenceId.
      */
+    @java.lang.Override
     public java.lang.String getPersistenceId() {
       java.lang.Object ref = persistenceId_;
       if (ref instanceof java.lang.String) {
@@ -11815,6 +11535,7 @@ public java.lang.String getPersistenceId() {
      *
      * @return The bytes for persistenceId.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getPersistenceIdBytes() {
       java.lang.Object ref = persistenceId_;
       if (ref instanceof java.lang.String) {
@@ -11828,12 +11549,13 @@ public org.apache.pekko.protobufv3.internal.ByteString getPersistenceIdBytes() {
     }
 
     public static final int SEQUENCENR_FIELD_NUMBER = 2;
-    private long sequenceNr_;
+    private long sequenceNr_ = 0L;
     /**
      * optional int64 sequenceNr = 2;
      *
      * @return Whether the sequenceNr field is set.
      */
+    @java.lang.Override
     public boolean hasSequenceNr() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -11842,6 +11564,7 @@ public boolean hasSequenceNr() {
      *
      * @return The sequenceNr.
      */
+    @java.lang.Override
     public long getSequenceNr() {
       return sequenceNr_;
     }
@@ -11853,6 +11576,7 @@ public long getSequenceNr() {
      *
      * @return Whether the payload field is set.
      */
+    @java.lang.Override
     public boolean hasPayload() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -11861,12 +11585,14 @@ public boolean hasPayload() {
      *
      * @return The payload.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.Payload getPayload() {
       return payload_ == null
           ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()
           : payload_;
     }
     /** optional .Payload payload = 3; */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getPayloadOrBuilder() {
       return payload_ == null
           ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()
@@ -11874,12 +11600,13 @@ public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getPayloadOrBui
     }
 
     public static final int TIMESTAMP_FIELD_NUMBER = 4;
-    private long timestamp_;
+    private long timestamp_ = 0L;
     /**
      * optional int64 timestamp = 4;
      *
      * @return Whether the timestamp field is set.
      */
+    @java.lang.Override
     public boolean hasTimestamp() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -11888,6 +11615,7 @@ public boolean hasTimestamp() {
      *
      * @return The timestamp.
      */
+    @java.lang.Override
     public long getTimestamp() {
       return timestamp_;
     }
@@ -11901,6 +11629,7 @@ public long getTimestamp() {
      *
      * @return Whether the metadata field is set.
      */
+    @java.lang.Override
     public boolean hasMetadata() {
       return ((bitField0_ & 0x00000010) != 0);
     }
@@ -11909,6 +11638,7 @@ public boolean hasMetadata() {
      *
      * @return The metadata.
      */
+    @java.lang.Override
     public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaData
         getMetadata() {
@@ -11918,6 +11648,7 @@ public boolean hasMetadata() {
           : metadata_;
     }
     /** optional .ReplicatedPublishedEventMetaData metadata = 5; */
+    @java.lang.Override
     public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaDataOrBuilder
         getMetadataOrBuilder() {
@@ -11970,7 +11701,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000010) != 0)) {
         output.writeMessage(5, getMetadata());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -12002,7 +11733,7 @@ public int getSerializedSize() {
             org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
                 5, getMetadata());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -12044,7 +11775,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasMetadata()) {
         if (!getMetadata().equals(other.getMetadata())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -12076,7 +11807,7 @@ public int hashCode() {
         hash = (37 * hash) + METADATA_FIELD_NUMBER;
         hash = (53 * hash) + getMetadata().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -12254,24 +11985,20 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         persistenceId_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         sequenceNr_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        if (payloadBuilder_ == null) {
-          payload_ = null;
-        } else {
-          payloadBuilder_.clear();
+        payload_ = null;
+        if (payloadBuilder_ != null) {
+          payloadBuilder_.dispose();
+          payloadBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000004);
         timestamp_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000008);
-        if (metadataBuilder_ == null) {
-          metadata_ = null;
-        } else {
-          metadataBuilder_.clear();
+        metadata_ = null;
+        if (metadataBuilder_ != null) {
+          metadataBuilder_.dispose();
+          metadataBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
@@ -12306,22 +12033,28 @@ public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor
             result =
                 new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .PublishedEvent(this);
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
+              result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.persistenceId_ = persistenceId_;
           to_bitField0_ |= 0x00000001;
         }
-        result.persistenceId_ = persistenceId_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.sequenceNr_ = sequenceNr_;
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
-          if (payloadBuilder_ == null) {
-            result.payload_ = payload_;
-          } else {
-            result.payload_ = payloadBuilder_.build();
-          }
+          result.payload_ = payloadBuilder_ == null ? payload_ : payloadBuilder_.build();
           to_bitField0_ |= 0x00000004;
         }
         if (((from_bitField0_ & 0x00000008) != 0)) {
@@ -12329,16 +12062,10 @@ public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptor
           to_bitField0_ |= 0x00000008;
         }
         if (((from_bitField0_ & 0x00000010) != 0)) {
-          if (metadataBuilder_ == null) {
-            result.metadata_ = metadata_;
-          } else {
-            result.metadata_ = metadataBuilder_.build();
-          }
+          result.metadata_ = metadataBuilder_ == null ? metadata_ : metadataBuilder_.build();
           to_bitField0_ |= 0x00000010;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -12403,8 +12130,8 @@ public Builder mergeFrom(
             == org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                 .PublishedEvent.getDefaultInstance()) return this;
         if (other.hasPersistenceId()) {
-          bitField0_ |= 0x00000001;
           persistenceId_ = other.persistenceId_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasSequenceNr()) {
@@ -12419,7 +12146,7 @@ public Builder mergeFrom(
         if (other.hasMetadata()) {
           mergeMetadata(other.getMetadata());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -12444,21 +12171,61 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
-            parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  persistenceId_ = input.readBytes();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+              case 16:
+                {
+                  sequenceNr_ = input.readInt64();
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 16
+              case 26:
+                {
+                  input.readMessage(getPayloadFieldBuilder().getBuilder(), extensionRegistry);
+                  bitField0_ |= 0x00000004;
+                  break;
+                } // case 26
+              case 32:
+                {
+                  timestamp_ = input.readInt64();
+                  bitField0_ |= 0x00000008;
+                  break;
+                } // case 32
+              case 42:
+                {
+                  input.readMessage(getMetadataFieldBuilder().getBuilder(), extensionRegistry);
+                  bitField0_ |= 0x00000010;
+                  break;
+                } // case 42
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                      .PublishedEvent)
-                  e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
 
@@ -12518,8 +12285,8 @@ public Builder setPersistenceId(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000001;
         persistenceId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -12529,8 +12296,8 @@ public Builder setPersistenceId(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearPersistenceId() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         persistenceId_ = getDefaultInstance().getPersistenceId();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -12544,8 +12311,8 @@ public Builder setPersistenceIdBytes(org.apache.pekko.protobufv3.internal.ByteSt
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000001;
         persistenceId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -12556,6 +12323,7 @@ public Builder setPersistenceIdBytes(org.apache.pekko.protobufv3.internal.ByteSt
        *
        * @return Whether the sequenceNr field is set.
        */
+      @java.lang.Override
       public boolean hasSequenceNr() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -12564,6 +12332,7 @@ public boolean hasSequenceNr() {
        *
        * @return The sequenceNr.
        */
+      @java.lang.Override
       public long getSequenceNr() {
         return sequenceNr_;
       }
@@ -12574,8 +12343,9 @@ public long getSequenceNr() {
        * @return This builder for chaining.
        */
       public Builder setSequenceNr(long value) {
-        bitField0_ |= 0x00000002;
+
         sequenceNr_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -12626,11 +12396,11 @@ public Builder setPayload(org.apache.pekko.remote.ContainerFormats.Payload value
             throw new NullPointerException();
           }
           payload_ = value;
-          onChanged();
         } else {
           payloadBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /** optional .Payload payload = 3; */
@@ -12638,11 +12408,11 @@ public Builder setPayload(
           org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (payloadBuilder_ == null) {
           payload_ = builderForValue.build();
-          onChanged();
         } else {
           payloadBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /** optional .Payload payload = 3; */
@@ -12652,29 +12422,28 @@ public Builder mergePayload(org.apache.pekko.remote.ContainerFormats.Payload val
               && payload_ != null
               && payload_
                   != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
-            payload_ =
-                org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(payload_)
-                    .mergeFrom(value)
-                    .buildPartial();
+            getPayloadBuilder().mergeFrom(value);
           } else {
             payload_ = value;
           }
-          onChanged();
         } else {
           payloadBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000004;
+        if (payload_ != null) {
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
         return this;
       }
       /** optional .Payload payload = 3; */
       public Builder clearPayload() {
-        if (payloadBuilder_ == null) {
-          payload_ = null;
-          onChanged();
-        } else {
-          payloadBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000004);
+        payload_ = null;
+        if (payloadBuilder_ != null) {
+          payloadBuilder_.dispose();
+          payloadBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /** optional .Payload payload = 3; */
@@ -12717,6 +12486,7 @@ public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getPayloadOrBui
        *
        * @return Whether the timestamp field is set.
        */
+      @java.lang.Override
       public boolean hasTimestamp() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -12725,6 +12495,7 @@ public boolean hasTimestamp() {
        *
        * @return The timestamp.
        */
+      @java.lang.Override
       public long getTimestamp() {
         return timestamp_;
       }
@@ -12735,8 +12506,9 @@ public long getTimestamp() {
        * @return This builder for chaining.
        */
       public Builder setTimestamp(long value) {
-        bitField0_ |= 0x00000008;
+
         timestamp_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -12798,11 +12570,11 @@ public Builder setMetadata(
             throw new NullPointerException();
           }
           metadata_ = value;
-          onChanged();
         } else {
           metadataBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /** optional .ReplicatedPublishedEventMetaData metadata = 5; */
@@ -12812,11 +12584,11 @@ public Builder setMetadata(
               builderForValue) {
         if (metadataBuilder_ == null) {
           metadata_ = builderForValue.build();
-          onChanged();
         } else {
           metadataBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /** optional .ReplicatedPublishedEventMetaData metadata = 5; */
@@ -12830,30 +12602,28 @@ public Builder mergeMetadata(
               && metadata_
                   != org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ReplicatedPublishedEventMetaData.getDefaultInstance()) {
-            metadata_ =
-                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
-                    .ReplicatedPublishedEventMetaData.newBuilder(metadata_)
-                    .mergeFrom(value)
-                    .buildPartial();
+            getMetadataBuilder().mergeFrom(value);
           } else {
             metadata_ = value;
           }
-          onChanged();
         } else {
           metadataBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000010;
+        if (metadata_ != null) {
+          bitField0_ |= 0x00000010;
+          onChanged();
+        }
         return this;
       }
       /** optional .ReplicatedPublishedEventMetaData metadata = 5; */
       public Builder clearMetadata() {
-        if (metadataBuilder_ == null) {
-          metadata_ = null;
-          onChanged();
-        } else {
-          metadataBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000010);
+        metadata_ = null;
+        if (metadataBuilder_ != null) {
+          metadataBuilder_.dispose();
+          metadataBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /** optional .ReplicatedPublishedEventMetaData metadata = 5; */
@@ -12941,7 +12711,19 @@ public PublishedEvent parsePartialFrom(
               org.apache.pekko.protobufv3.internal.CodedInputStream input,
               org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
               throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-            return new PublishedEvent(input, extensionRegistry);
+            Builder builder = newBuilder();
+            try {
+              builder.mergeFrom(input, extensionRegistry);
+            } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+              throw e.setUnfinishedMessage(builder.buildPartial());
+            } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+              throw e.asInvalidProtocolBufferException()
+                  .setUnfinishedMessage(builder.buildPartial());
+            } catch (java.io.IOException e) {
+              throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                  .setUnfinishedMessage(builder.buildPartial());
+            }
+            return builder.buildPartial();
           }
         };
 
diff --git a/persistence/src/main/java/org/apache/pekko/persistence/serialization/MessageFormats.java b/persistence/src/main/java/org/apache/pekko/persistence/serialization/MessageFormats.java
index 24fbe55b242..d1d28ffc3a4 100644
--- a/persistence/src/main/java/org/apache/pekko/persistence/serialization/MessageFormats.java
+++ b/persistence/src/main/java/org/apache/pekko/persistence/serialization/MessageFormats.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2020-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: MessageFormats.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.persistence.serialization;
 
 public final class MessageFormats {
@@ -94,16 +95,40 @@ public interface PersistentMessageOrBuilder extends
     boolean getDeleted();
 
     /**
+     * 
+     * optional int32 redeliveries = 6; // Removed in Akka 2.4
+     * repeated string confirms = 7; // Removed in Akka 2.4
+     * optional bool confirmable = 8;  // Removed in Akka 2.4
+     * optional DeliveredMessage confirmMessage = 9; // Removed in Akka 2.4
+     * optional string confirmTarget = 10; // Removed in Akka 2.4
+     * 

+     *
      * optional string sender = 11;
      * @return Whether the sender field is set.
      */
     boolean hasSender();
     /**
+     * 
+     * optional int32 redeliveries = 6; // Removed in Akka 2.4
+     * repeated string confirms = 7; // Removed in Akka 2.4
+     * optional bool confirmable = 8;  // Removed in Akka 2.4
+     * optional DeliveredMessage confirmMessage = 9; // Removed in Akka 2.4
+     * optional string confirmTarget = 10; // Removed in Akka 2.4
+     * 

+     *
      * optional string sender = 11;
      * @return The sender.
      */
     java.lang.String getSender();
     /**
+     * 
+     * optional int32 redeliveries = 6; // Removed in Akka 2.4
+     * repeated string confirms = 7; // Removed in Akka 2.4
+     * optional bool confirmable = 8;  // Removed in Akka 2.4
+     * optional DeliveredMessage confirmMessage = 9; // Removed in Akka 2.4
+     * optional string confirmTarget = 10; // Removed in Akka 2.4
+     * 

+     *
      * optional string sender = 11;
      * @return The bytes for sender.
      */
@@ -173,7 +198,7 @@ public interface PersistentMessageOrBuilder extends
   /**
    * Protobuf type {@code PersistentMessage}
    */
-  public  static final class PersistentMessage extends
+  public static final class PersistentMessage extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:PersistentMessage)
       PersistentMessageOrBuilder {
@@ -196,114 +221,6 @@ protected java.lang.Object newInstance(
       return new PersistentMessage();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private PersistentMessage(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = payload_.toBuilder();
-              }
-              payload_ = input.readMessage(org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(payload_);
-                payload_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              sequenceNr_ = input.readInt64();
-              break;
-            }
-            case 26: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000004;
-              persistenceId_ = bs;
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              deleted_ = input.readBool();
-              break;
-            }
-            case 90: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000010;
-              sender_ = bs;
-              break;
-            }
-            case 98: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000020;
-              manifest_ = bs;
-              break;
-            }
-            case 106: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000040;
-              writerUuid_ = bs;
-              break;
-            }
-            case 112: {
-              bitField0_ |= 0x00000080;
-              timestamp_ = input.readSInt64();
-              break;
-            }
-            case 122: {
-              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000100) != 0)) {
-                subBuilder = metadata_.toBuilder();
-              }
-              metadata_ = input.readMessage(org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(metadata_);
-                metadata_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000100;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.persistence.serialization.MessageFormats.internal_static_PersistentMessage_descriptor;
@@ -324,6 +241,7 @@ private PersistentMessage(
      * optional .PersistentPayload payload = 1;
      * @return Whether the payload field is set.
      */
+    @java.lang.Override
     public boolean hasPayload() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -331,22 +249,25 @@ public boolean hasPayload() {
      * optional .PersistentPayload payload = 1;
      * @return The payload.
      */
+    @java.lang.Override
     public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload getPayload() {
       return payload_ == null ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : payload_;
     }
     /**
      * optional .PersistentPayload payload = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder getPayloadOrBuilder() {
       return payload_ == null ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : payload_;
     }
 
     public static final int SEQUENCENR_FIELD_NUMBER = 2;
-    private long sequenceNr_;
+    private long sequenceNr_ = 0L;
     /**
      * optional int64 sequenceNr = 2;
      * @return Whether the sequenceNr field is set.
      */
+    @java.lang.Override
     public boolean hasSequenceNr() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -354,16 +275,19 @@ public boolean hasSequenceNr() {
      * optional int64 sequenceNr = 2;
      * @return The sequenceNr.
      */
+    @java.lang.Override
     public long getSequenceNr() {
       return sequenceNr_;
     }
 
     public static final int PERSISTENCEID_FIELD_NUMBER = 3;
-    private volatile java.lang.Object persistenceId_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object persistenceId_ = "";
     /**
      * optional string persistenceId = 3;
      * @return Whether the persistenceId field is set.
      */
+    @java.lang.Override
     public boolean hasPersistenceId() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -371,6 +295,7 @@ public boolean hasPersistenceId() {
      * optional string persistenceId = 3;
      * @return The persistenceId.
      */
+    @java.lang.Override
     public java.lang.String getPersistenceId() {
       java.lang.Object ref = persistenceId_;
       if (ref instanceof java.lang.String) {
@@ -389,6 +314,7 @@ public java.lang.String getPersistenceId() {
      * optional string persistenceId = 3;
      * @return The bytes for persistenceId.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getPersistenceIdBytes() {
       java.lang.Object ref = persistenceId_;
@@ -404,7 +330,7 @@ public java.lang.String getPersistenceId() {
     }
 
     public static final int DELETED_FIELD_NUMBER = 4;
-    private boolean deleted_;
+    private boolean deleted_ = false;
     /**
      * 
      * not used in new records from Akka 2.4
@@ -413,6 +339,7 @@ public java.lang.String getPersistenceId() {
      * optional bool deleted = 4;
      * @return Whether the deleted field is set.
      */
+    @java.lang.Override
     public boolean hasDeleted() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -424,23 +351,43 @@ public boolean hasDeleted() {
      * optional bool deleted = 4;
      * @return The deleted.
      */
+    @java.lang.Override
     public boolean getDeleted() {
       return deleted_;
     }
 
     public static final int SENDER_FIELD_NUMBER = 11;
-    private volatile java.lang.Object sender_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object sender_ = "";
     /**
+     * 
+     * optional int32 redeliveries = 6; // Removed in Akka 2.4
+     * repeated string confirms = 7; // Removed in Akka 2.4
+     * optional bool confirmable = 8;  // Removed in Akka 2.4
+     * optional DeliveredMessage confirmMessage = 9; // Removed in Akka 2.4
+     * optional string confirmTarget = 10; // Removed in Akka 2.4
+     * 

+     *
      * optional string sender = 11;
      * @return Whether the sender field is set.
      */
+    @java.lang.Override
     public boolean hasSender() {
       return ((bitField0_ & 0x00000010) != 0);
     }
     /**
+     * 
+     * optional int32 redeliveries = 6; // Removed in Akka 2.4
+     * repeated string confirms = 7; // Removed in Akka 2.4
+     * optional bool confirmable = 8;  // Removed in Akka 2.4
+     * optional DeliveredMessage confirmMessage = 9; // Removed in Akka 2.4
+     * optional string confirmTarget = 10; // Removed in Akka 2.4
+     * 

+     *
      * optional string sender = 11;
      * @return The sender.
      */
+    @java.lang.Override
     public java.lang.String getSender() {
       java.lang.Object ref = sender_;
       if (ref instanceof java.lang.String) {
@@ -456,9 +403,18 @@ public java.lang.String getSender() {
       }
     }
     /**
+     * 
+     * optional int32 redeliveries = 6; // Removed in Akka 2.4
+     * repeated string confirms = 7; // Removed in Akka 2.4
+     * optional bool confirmable = 8;  // Removed in Akka 2.4
+     * optional DeliveredMessage confirmMessage = 9; // Removed in Akka 2.4
+     * optional string confirmTarget = 10; // Removed in Akka 2.4
+     * 

+     *
      * optional string sender = 11;
      * @return The bytes for sender.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getSenderBytes() {
       java.lang.Object ref = sender_;
@@ -474,11 +430,13 @@ public java.lang.String getSender() {
     }
 
     public static final int MANIFEST_FIELD_NUMBER = 12;
-    private volatile java.lang.Object manifest_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object manifest_ = "";
     /**
      * optional string manifest = 12;
      * @return Whether the manifest field is set.
      */
+    @java.lang.Override
     public boolean hasManifest() {
       return ((bitField0_ & 0x00000020) != 0);
     }
@@ -486,6 +444,7 @@ public boolean hasManifest() {
      * optional string manifest = 12;
      * @return The manifest.
      */
+    @java.lang.Override
     public java.lang.String getManifest() {
       java.lang.Object ref = manifest_;
       if (ref instanceof java.lang.String) {
@@ -504,6 +463,7 @@ public java.lang.String getManifest() {
      * optional string manifest = 12;
      * @return The bytes for manifest.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getManifestBytes() {
       java.lang.Object ref = manifest_;
@@ -519,11 +479,13 @@ public java.lang.String getManifest() {
     }
 
     public static final int WRITERUUID_FIELD_NUMBER = 13;
-    private volatile java.lang.Object writerUuid_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object writerUuid_ = "";
     /**
      * optional string writerUuid = 13;
      * @return Whether the writerUuid field is set.
      */
+    @java.lang.Override
     public boolean hasWriterUuid() {
       return ((bitField0_ & 0x00000040) != 0);
     }
@@ -531,6 +493,7 @@ public boolean hasWriterUuid() {
      * optional string writerUuid = 13;
      * @return The writerUuid.
      */
+    @java.lang.Override
     public java.lang.String getWriterUuid() {
       java.lang.Object ref = writerUuid_;
       if (ref instanceof java.lang.String) {
@@ -549,6 +512,7 @@ public java.lang.String getWriterUuid() {
      * optional string writerUuid = 13;
      * @return The bytes for writerUuid.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getWriterUuidBytes() {
       java.lang.Object ref = writerUuid_;
@@ -564,11 +528,12 @@ public java.lang.String getWriterUuid() {
     }
 
     public static final int TIMESTAMP_FIELD_NUMBER = 14;
-    private long timestamp_;
+    private long timestamp_ = 0L;
     /**
      * optional sint64 timestamp = 14;
      * @return Whether the timestamp field is set.
      */
+    @java.lang.Override
     public boolean hasTimestamp() {
       return ((bitField0_ & 0x00000080) != 0);
     }
@@ -576,6 +541,7 @@ public boolean hasTimestamp() {
      * optional sint64 timestamp = 14;
      * @return The timestamp.
      */
+    @java.lang.Override
     public long getTimestamp() {
       return timestamp_;
     }
@@ -586,6 +552,7 @@ public long getTimestamp() {
      * optional .PersistentPayload metadata = 15;
      * @return Whether the metadata field is set.
      */
+    @java.lang.Override
     public boolean hasMetadata() {
       return ((bitField0_ & 0x00000100) != 0);
     }
@@ -593,12 +560,14 @@ public boolean hasMetadata() {
      * optional .PersistentPayload metadata = 15;
      * @return The metadata.
      */
+    @java.lang.Override
     public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload getMetadata() {
       return metadata_ == null ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : metadata_;
     }
     /**
      * optional .PersistentPayload metadata = 15;
      */
+    @java.lang.Override
     public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder getMetadataOrBuilder() {
       return metadata_ == null ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : metadata_;
     }
@@ -656,7 +625,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000100) != 0)) {
         output.writeMessage(15, getMetadata());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -697,7 +666,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(15, getMetadata());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -757,7 +726,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getMetadata()
             .equals(other.getMetadata())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -807,7 +776,7 @@ public int hashCode() {
         hash = (37 * hash) + METADATA_FIELD_NUMBER;
         hash = (53 * hash) + getMetadata().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -856,11 +825,13 @@ public static org.apache.pekko.persistence.serialization.MessageFormats.Persiste
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -942,32 +913,24 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (payloadBuilder_ == null) {
-          payload_ = null;
-        } else {
-          payloadBuilder_.clear();
+        bitField0_ = 0;
+        payload_ = null;
+        if (payloadBuilder_ != null) {
+          payloadBuilder_.dispose();
+          payloadBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         sequenceNr_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
         persistenceId_ = "";
-        bitField0_ = (bitField0_ & ~0x00000004);
         deleted_ = false;
-        bitField0_ = (bitField0_ & ~0x00000008);
         sender_ = "";
-        bitField0_ = (bitField0_ & ~0x00000010);
         manifest_ = "";
-        bitField0_ = (bitField0_ & ~0x00000020);
         writerUuid_ = "";
-        bitField0_ = (bitField0_ & ~0x00000040);
         timestamp_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000080);
-        if (metadataBuilder_ == null) {
-          metadata_ = null;
-        } else {
-          metadataBuilder_.clear();
+        metadata_ = null;
+        if (metadataBuilder_ != null) {
+          metadataBuilder_.dispose();
+          metadataBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000100);
         return this;
       }
 
@@ -994,14 +957,18 @@ public org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessa
       @java.lang.Override
       public org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage buildPartial() {
         org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage result = new org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (payloadBuilder_ == null) {
-            result.payload_ = payload_;
-          } else {
-            result.payload_ = payloadBuilder_.build();
-          }
+          result.payload_ = payloadBuilder_ == null
+              ? payload_
+              : payloadBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
@@ -1009,40 +976,36 @@ public org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessa
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.persistenceId_ = persistenceId_;
           to_bitField0_ |= 0x00000004;
         }
-        result.persistenceId_ = persistenceId_;
         if (((from_bitField0_ & 0x00000008) != 0)) {
           result.deleted_ = deleted_;
           to_bitField0_ |= 0x00000008;
         }
         if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.sender_ = sender_;
           to_bitField0_ |= 0x00000010;
         }
-        result.sender_ = sender_;
         if (((from_bitField0_ & 0x00000020) != 0)) {
+          result.manifest_ = manifest_;
           to_bitField0_ |= 0x00000020;
         }
-        result.manifest_ = manifest_;
         if (((from_bitField0_ & 0x00000040) != 0)) {
+          result.writerUuid_ = writerUuid_;
           to_bitField0_ |= 0x00000040;
         }
-        result.writerUuid_ = writerUuid_;
         if (((from_bitField0_ & 0x00000080) != 0)) {
           result.timestamp_ = timestamp_;
           to_bitField0_ |= 0x00000080;
         }
         if (((from_bitField0_ & 0x00000100) != 0)) {
-          if (metadataBuilder_ == null) {
-            result.metadata_ = metadata_;
-          } else {
-            result.metadata_ = metadataBuilder_.build();
-          }
+          result.metadata_ = metadataBuilder_ == null
+              ? metadata_
+              : metadataBuilder_.build();
           to_bitField0_ |= 0x00000100;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1096,26 +1059,26 @@ public Builder mergeFrom(org.apache.pekko.persistence.serialization.MessageForma
           setSequenceNr(other.getSequenceNr());
         }
         if (other.hasPersistenceId()) {
-          bitField0_ |= 0x00000004;
           persistenceId_ = other.persistenceId_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
         if (other.hasDeleted()) {
           setDeleted(other.getDeleted());
         }
         if (other.hasSender()) {
-          bitField0_ |= 0x00000010;
           sender_ = other.sender_;
+          bitField0_ |= 0x00000010;
           onChanged();
         }
         if (other.hasManifest()) {
-          bitField0_ |= 0x00000020;
           manifest_ = other.manifest_;
+          bitField0_ |= 0x00000020;
           onChanged();
         }
         if (other.hasWriterUuid()) {
-          bitField0_ |= 0x00000040;
           writerUuid_ = other.writerUuid_;
+          bitField0_ |= 0x00000040;
           onChanged();
         }
         if (other.hasTimestamp()) {
@@ -1124,7 +1087,7 @@ public Builder mergeFrom(org.apache.pekko.persistence.serialization.MessageForma
         if (other.hasMetadata()) {
           mergeMetadata(other.getMetadata());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1149,17 +1112,79 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getPayloadFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                sequenceNr_ = input.readInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 26: {
+                persistenceId_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              case 32: {
+                deleted_ = input.readBool();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              case 90: {
+                sender_ = input.readBytes();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 90
+              case 98: {
+                manifest_ = input.readBytes();
+                bitField0_ |= 0x00000020;
+                break;
+              } // case 98
+              case 106: {
+                writerUuid_ = input.readBytes();
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 106
+              case 112: {
+                timestamp_ = input.readSInt64();
+                bitField0_ |= 0x00000080;
+                break;
+              } // case 112
+              case 122: {
+                input.readMessage(
+                    getMetadataFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000100;
+                break;
+              } // case 122
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -1194,11 +1219,11 @@ public Builder setPayload(org.apache.pekko.persistence.serialization.MessageForm
             throw new NullPointerException();
           }
           payload_ = value;
-          onChanged();
         } else {
           payloadBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1208,11 +1233,11 @@ public Builder setPayload(
           org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder builderForValue) {
         if (payloadBuilder_ == null) {
           payload_ = builderForValue.build();
-          onChanged();
         } else {
           payloadBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1221,31 +1246,32 @@ public Builder setPayload(
       public Builder mergePayload(org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload value) {
         if (payloadBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              payload_ != null &&
-              payload_ != org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance()) {
-            payload_ =
-              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.newBuilder(payload_).mergeFrom(value).buildPartial();
+            payload_ != null &&
+            payload_ != org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance()) {
+            getPayloadBuilder().mergeFrom(value);
           } else {
             payload_ = value;
           }
-          onChanged();
         } else {
           payloadBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (payload_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .PersistentPayload payload = 1;
        */
       public Builder clearPayload() {
-        if (payloadBuilder_ == null) {
-          payload_ = null;
-          onChanged();
-        } else {
-          payloadBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        payload_ = null;
+        if (payloadBuilder_ != null) {
+          payloadBuilder_.dispose();
+          payloadBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -1289,6 +1315,7 @@ public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPaylo
        * optional int64 sequenceNr = 2;
        * @return Whether the sequenceNr field is set.
        */
+      @java.lang.Override
       public boolean hasSequenceNr() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -1296,6 +1323,7 @@ public boolean hasSequenceNr() {
        * optional int64 sequenceNr = 2;
        * @return The sequenceNr.
        */
+      @java.lang.Override
       public long getSequenceNr() {
         return sequenceNr_;
       }
@@ -1305,8 +1333,9 @@ public long getSequenceNr() {
        * @return This builder for chaining.
        */
       public Builder setSequenceNr(long value) {
-        bitField0_ |= 0x00000002;
+
         sequenceNr_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1371,11 +1400,9 @@ public java.lang.String getPersistenceId() {
        */
       public Builder setPersistenceId(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         persistenceId_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1384,8 +1411,8 @@ public Builder setPersistenceId(
        * @return This builder for chaining.
        */
       public Builder clearPersistenceId() {
-        bitField0_ = (bitField0_ & ~0x00000004);
         persistenceId_ = getDefaultInstance().getPersistenceId();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -1396,11 +1423,9 @@ public Builder clearPersistenceId() {
        */
       public Builder setPersistenceIdBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         persistenceId_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1414,6 +1439,7 @@ public Builder setPersistenceIdBytes(
        * optional bool deleted = 4;
        * @return Whether the deleted field is set.
        */
+      @java.lang.Override
       public boolean hasDeleted() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -1425,6 +1451,7 @@ public boolean hasDeleted() {
        * optional bool deleted = 4;
        * @return The deleted.
        */
+      @java.lang.Override
       public boolean getDeleted() {
         return deleted_;
       }
@@ -1438,8 +1465,9 @@ public boolean getDeleted() {
        * @return This builder for chaining.
        */
       public Builder setDeleted(boolean value) {
-        bitField0_ |= 0x00000008;
+
         deleted_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -1460,6 +1488,14 @@ public Builder clearDeleted() {
 
       private java.lang.Object sender_ = "";
       /**
+       * 
+       * optional int32 redeliveries = 6; // Removed in Akka 2.4
+       * repeated string confirms = 7; // Removed in Akka 2.4
+       * optional bool confirmable = 8;  // Removed in Akka 2.4
+       * optional DeliveredMessage confirmMessage = 9; // Removed in Akka 2.4
+       * optional string confirmTarget = 10; // Removed in Akka 2.4
+       * 

+       *
        * optional string sender = 11;
        * @return Whether the sender field is set.
        */
@@ -1467,6 +1503,14 @@ public boolean hasSender() {
         return ((bitField0_ & 0x00000010) != 0);
       }
       /**
+       * 
+       * optional int32 redeliveries = 6; // Removed in Akka 2.4
+       * repeated string confirms = 7; // Removed in Akka 2.4
+       * optional bool confirmable = 8;  // Removed in Akka 2.4
+       * optional DeliveredMessage confirmMessage = 9; // Removed in Akka 2.4
+       * optional string confirmTarget = 10; // Removed in Akka 2.4
+       * 

+       *
        * optional string sender = 11;
        * @return The sender.
        */
@@ -1485,6 +1529,14 @@ public java.lang.String getSender() {
         }
       }
       /**
+       * 
+       * optional int32 redeliveries = 6; // Removed in Akka 2.4
+       * repeated string confirms = 7; // Removed in Akka 2.4
+       * optional bool confirmable = 8;  // Removed in Akka 2.4
+       * optional DeliveredMessage confirmMessage = 9; // Removed in Akka 2.4
+       * optional string confirmTarget = 10; // Removed in Akka 2.4
+       * 

+       *
        * optional string sender = 11;
        * @return The bytes for sender.
        */
@@ -1502,42 +1554,62 @@ public java.lang.String getSender() {
         }
       }
       /**
+       * 
+       * optional int32 redeliveries = 6; // Removed in Akka 2.4
+       * repeated string confirms = 7; // Removed in Akka 2.4
+       * optional bool confirmable = 8;  // Removed in Akka 2.4
+       * optional DeliveredMessage confirmMessage = 9; // Removed in Akka 2.4
+       * optional string confirmTarget = 10; // Removed in Akka 2.4
+       * 

+       *
        * optional string sender = 11;
        * @param value The sender to set.
        * @return This builder for chaining.
        */
       public Builder setSender(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000010;
+        if (value == null) { throw new NullPointerException(); }
         sender_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
       /**
+       * 
+       * optional int32 redeliveries = 6; // Removed in Akka 2.4
+       * repeated string confirms = 7; // Removed in Akka 2.4
+       * optional bool confirmable = 8;  // Removed in Akka 2.4
+       * optional DeliveredMessage confirmMessage = 9; // Removed in Akka 2.4
+       * optional string confirmTarget = 10; // Removed in Akka 2.4
+       * 

+       *
        * optional string sender = 11;
        * @return This builder for chaining.
        */
       public Builder clearSender() {
-        bitField0_ = (bitField0_ & ~0x00000010);
         sender_ = getDefaultInstance().getSender();
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
       }
       /**
+       * 
+       * optional int32 redeliveries = 6; // Removed in Akka 2.4
+       * repeated string confirms = 7; // Removed in Akka 2.4
+       * optional bool confirmable = 8;  // Removed in Akka 2.4
+       * optional DeliveredMessage confirmMessage = 9; // Removed in Akka 2.4
+       * optional string confirmTarget = 10; // Removed in Akka 2.4
+       * 

+       *
        * optional string sender = 11;
        * @param value The bytes for sender to set.
        * @return This builder for chaining.
        */
       public Builder setSenderBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000010;
+        if (value == null) { throw new NullPointerException(); }
         sender_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1592,11 +1664,9 @@ public java.lang.String getManifest() {
        */
       public Builder setManifest(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000020;
+        if (value == null) { throw new NullPointerException(); }
         manifest_ = value;
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -1605,8 +1675,8 @@ public Builder setManifest(
        * @return This builder for chaining.
        */
       public Builder clearManifest() {
-        bitField0_ = (bitField0_ & ~0x00000020);
         manifest_ = getDefaultInstance().getManifest();
+        bitField0_ = (bitField0_ & ~0x00000020);
         onChanged();
         return this;
       }
@@ -1617,11 +1687,9 @@ public Builder clearManifest() {
        */
       public Builder setManifestBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000020;
+        if (value == null) { throw new NullPointerException(); }
         manifest_ = value;
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -1676,11 +1744,9 @@ public java.lang.String getWriterUuid() {
        */
       public Builder setWriterUuid(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000040;
+        if (value == null) { throw new NullPointerException(); }
         writerUuid_ = value;
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -1689,8 +1755,8 @@ public Builder setWriterUuid(
        * @return This builder for chaining.
        */
       public Builder clearWriterUuid() {
-        bitField0_ = (bitField0_ & ~0x00000040);
         writerUuid_ = getDefaultInstance().getWriterUuid();
+        bitField0_ = (bitField0_ & ~0x00000040);
         onChanged();
         return this;
       }
@@ -1701,11 +1767,9 @@ public Builder clearWriterUuid() {
        */
       public Builder setWriterUuidBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000040;
+        if (value == null) { throw new NullPointerException(); }
         writerUuid_ = value;
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -1715,6 +1779,7 @@ public Builder setWriterUuidBytes(
        * optional sint64 timestamp = 14;
        * @return Whether the timestamp field is set.
        */
+      @java.lang.Override
       public boolean hasTimestamp() {
         return ((bitField0_ & 0x00000080) != 0);
       }
@@ -1722,6 +1787,7 @@ public boolean hasTimestamp() {
        * optional sint64 timestamp = 14;
        * @return The timestamp.
        */
+      @java.lang.Override
       public long getTimestamp() {
         return timestamp_;
       }
@@ -1731,8 +1797,9 @@ public long getTimestamp() {
        * @return This builder for chaining.
        */
       public Builder setTimestamp(long value) {
-        bitField0_ |= 0x00000080;
+
         timestamp_ = value;
+        bitField0_ |= 0x00000080;
         onChanged();
         return this;
       }
@@ -1777,11 +1844,11 @@ public Builder setMetadata(org.apache.pekko.persistence.serialization.MessageFor
             throw new NullPointerException();
           }
           metadata_ = value;
-          onChanged();
         } else {
           metadataBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000100;
+        onChanged();
         return this;
       }
       /**
@@ -1791,11 +1858,11 @@ public Builder setMetadata(
           org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder builderForValue) {
         if (metadataBuilder_ == null) {
           metadata_ = builderForValue.build();
-          onChanged();
         } else {
           metadataBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000100;
+        onChanged();
         return this;
       }
       /**
@@ -1804,31 +1871,32 @@ public Builder setMetadata(
       public Builder mergeMetadata(org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload value) {
         if (metadataBuilder_ == null) {
           if (((bitField0_ & 0x00000100) != 0) &&
-              metadata_ != null &&
-              metadata_ != org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance()) {
-            metadata_ =
-              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.newBuilder(metadata_).mergeFrom(value).buildPartial();
+            metadata_ != null &&
+            metadata_ != org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance()) {
+            getMetadataBuilder().mergeFrom(value);
           } else {
             metadata_ = value;
           }
-          onChanged();
         } else {
           metadataBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000100;
+        if (metadata_ != null) {
+          bitField0_ |= 0x00000100;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .PersistentPayload metadata = 15;
        */
       public Builder clearMetadata() {
-        if (metadataBuilder_ == null) {
-          metadata_ = null;
-          onChanged();
-        } else {
-          metadataBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000100);
+        metadata_ = null;
+        if (metadataBuilder_ != null) {
+          metadataBuilder_.dispose();
+          metadataBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -1899,7 +1967,18 @@ public PersistentMessage parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new PersistentMessage(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -1959,7 +2038,7 @@ public interface PersistentPayloadOrBuilder extends
   /**
    * Protobuf type {@code PersistentPayload}
    */
-  public  static final class PersistentPayload extends
+  public static final class PersistentPayload extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:PersistentPayload)
       PersistentPayloadOrBuilder {
@@ -1980,64 +2059,6 @@ protected java.lang.Object newInstance(
       return new PersistentPayload();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private PersistentPayload(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              serializerId_ = input.readInt32();
-              break;
-            }
-            case 18: {
-              bitField0_ |= 0x00000002;
-              payload_ = input.readBytes();
-              break;
-            }
-            case 26: {
-              bitField0_ |= 0x00000004;
-              payloadManifest_ = input.readBytes();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.persistence.serialization.MessageFormats.internal_static_PersistentPayload_descriptor;
@@ -2053,11 +2074,12 @@ private PersistentPayload(
 
     private int bitField0_;
     public static final int SERIALIZERID_FIELD_NUMBER = 1;
-    private int serializerId_;
+    private int serializerId_ = 0;
     /**
      * required int32 serializerId = 1;
      * @return Whether the serializerId field is set.
      */
+    @java.lang.Override
     public boolean hasSerializerId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -2065,16 +2087,18 @@ public boolean hasSerializerId() {
      * required int32 serializerId = 1;
      * @return The serializerId.
      */
+    @java.lang.Override
     public int getSerializerId() {
       return serializerId_;
     }
 
     public static final int PAYLOAD_FIELD_NUMBER = 2;
-    private org.apache.pekko.protobufv3.internal.ByteString payload_;
+    private org.apache.pekko.protobufv3.internal.ByteString payload_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * required bytes payload = 2;
      * @return Whether the payload field is set.
      */
+    @java.lang.Override
     public boolean hasPayload() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -2082,16 +2106,18 @@ public boolean hasPayload() {
      * required bytes payload = 2;
      * @return The payload.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getPayload() {
       return payload_;
     }
 
     public static final int PAYLOADMANIFEST_FIELD_NUMBER = 3;
-    private org.apache.pekko.protobufv3.internal.ByteString payloadManifest_;
+    private org.apache.pekko.protobufv3.internal.ByteString payloadManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * optional bytes payloadManifest = 3;
      * @return Whether the payloadManifest field is set.
      */
+    @java.lang.Override
     public boolean hasPayloadManifest() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -2099,6 +2125,7 @@ public boolean hasPayloadManifest() {
      * optional bytes payloadManifest = 3;
      * @return The payloadManifest.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getPayloadManifest() {
       return payloadManifest_;
     }
@@ -2134,7 +2161,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeBytes(3, payloadManifest_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -2155,7 +2182,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(3, payloadManifest_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2185,7 +2212,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getPayloadManifest()
             .equals(other.getPayloadManifest())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -2208,7 +2235,7 @@ public int hashCode() {
         hash = (37 * hash) + PAYLOADMANIFEST_FIELD_NUMBER;
         hash = (53 * hash) + getPayloadManifest().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -2257,11 +2284,13 @@ public static org.apache.pekko.persistence.serialization.MessageFormats.Persiste
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -2325,28 +2354,21 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         serializerId_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000001);
         payload_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000002);
         payloadManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -2373,6 +2395,12 @@ public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPaylo
       @java.lang.Override
       public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload buildPartial() {
         org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload result = new org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -2380,16 +2408,14 @@ public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPaylo
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.payload_ = payload_;
           to_bitField0_ |= 0x00000002;
         }
-        result.payload_ = payload_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.payloadManifest_ = payloadManifest_;
           to_bitField0_ |= 0x00000004;
         }
-        result.payloadManifest_ = payloadManifest_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -2445,7 +2471,7 @@ public Builder mergeFrom(org.apache.pekko.persistence.serialization.MessageForma
         if (other.hasPayloadManifest()) {
           setPayloadManifest(other.getPayloadManifest());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -2466,17 +2492,45 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                serializerId_ = input.readInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 18: {
+                payload_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 26: {
+                payloadManifest_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -2486,6 +2540,7 @@ public Builder mergeFrom(
        * required int32 serializerId = 1;
        * @return Whether the serializerId field is set.
        */
+      @java.lang.Override
       public boolean hasSerializerId() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -2493,6 +2548,7 @@ public boolean hasSerializerId() {
        * required int32 serializerId = 1;
        * @return The serializerId.
        */
+      @java.lang.Override
       public int getSerializerId() {
         return serializerId_;
       }
@@ -2502,8 +2558,9 @@ public int getSerializerId() {
        * @return This builder for chaining.
        */
       public Builder setSerializerId(int value) {
-        bitField0_ |= 0x00000001;
+
         serializerId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2523,6 +2580,7 @@ public Builder clearSerializerId() {
        * required bytes payload = 2;
        * @return Whether the payload field is set.
        */
+      @java.lang.Override
       public boolean hasPayload() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -2530,6 +2588,7 @@ public boolean hasPayload() {
        * required bytes payload = 2;
        * @return The payload.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getPayload() {
         return payload_;
       }
@@ -2539,11 +2598,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getPayload() {
        * @return This builder for chaining.
        */
       public Builder setPayload(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         payload_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2563,6 +2620,7 @@ public Builder clearPayload() {
        * optional bytes payloadManifest = 3;
        * @return Whether the payloadManifest field is set.
        */
+      @java.lang.Override
       public boolean hasPayloadManifest() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -2570,6 +2628,7 @@ public boolean hasPayloadManifest() {
        * optional bytes payloadManifest = 3;
        * @return The payloadManifest.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getPayloadManifest() {
         return payloadManifest_;
       }
@@ -2579,11 +2638,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getPayloadManifest() {
        * @return This builder for chaining.
        */
       public Builder setPayloadManifest(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         payloadManifest_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -2630,7 +2687,18 @@ public PersistentPayload parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new PersistentPayload(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -2681,7 +2749,7 @@ org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessageOrBui
   /**
    * Protobuf type {@code AtomicWrite}
    */
-  public  static final class AtomicWrite extends
+  public static final class AtomicWrite extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:AtomicWrite)
       AtomicWriteOrBuilder {
@@ -2701,61 +2769,6 @@ protected java.lang.Object newInstance(
       return new AtomicWrite();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private AtomicWrite(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                payload_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              payload_.add(
-                  input.readMessage(org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          payload_ = java.util.Collections.unmodifiableList(payload_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.persistence.serialization.MessageFormats.internal_static_AtomicWrite_descriptor;
@@ -2770,16 +2783,19 @@ private AtomicWrite(
     }
 
     public static final int PAYLOAD_FIELD_NUMBER = 1;
+    @SuppressWarnings("serial")
     private java.util.List payload_;
     /**
      * repeated .PersistentMessage payload = 1;
      */
+    @java.lang.Override
     public java.util.List getPayloadList() {
       return payload_;
     }
     /**
      * repeated .PersistentMessage payload = 1;
      */
+    @java.lang.Override
     public java.util.List 
         getPayloadOrBuilderList() {
       return payload_;
@@ -2787,18 +2803,21 @@ public java.util.Listrepeated .PersistentMessage payload = 1;
      */
+    @java.lang.Override
     public int getPayloadCount() {
       return payload_.size();
     }
     /**
      * repeated .PersistentMessage payload = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage getPayload(int index) {
       return payload_.get(index);
     }
     /**
      * repeated .PersistentMessage payload = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessageOrBuilder getPayloadOrBuilder(
         int index) {
       return payload_.get(index);
@@ -2827,7 +2846,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < payload_.size(); i++) {
         output.writeMessage(1, payload_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -2840,7 +2859,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, payload_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2857,7 +2876,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getPayloadList()
           .equals(other.getPayloadList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -2872,7 +2891,7 @@ public int hashCode() {
         hash = (37 * hash) + PAYLOAD_FIELD_NUMBER;
         hash = (53 * hash) + getPayloadList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -2921,11 +2940,13 @@ public static org.apache.pekko.persistence.serialization.MessageFormats.AtomicWr
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -2989,29 +3010,25 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getPayloadFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (payloadBuilder_ == null) {
           payload_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
+          payload_ = null;
           payloadBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -3038,7 +3055,13 @@ public org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite bui
       @java.lang.Override
       public org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite buildPartial() {
         org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite result = new org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite(this);
-        int from_bitField0_ = bitField0_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite result) {
         if (payloadBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             payload_ = java.util.Collections.unmodifiableList(payload_);
@@ -3048,8 +3071,10 @@ public org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite bui
         } else {
           result.payload_ = payloadBuilder_.build();
         }
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite result) {
+        int from_bitField0_ = bitField0_;
       }
 
       @java.lang.Override
@@ -3122,7 +3147,7 @@ public Builder mergeFrom(org.apache.pekko.persistence.serialization.MessageForma
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -3142,17 +3167,43 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage m =
+                    input.readMessage(
+                        org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage.PARSER,
+                        extensionRegistry);
+                if (payloadBuilder_ == null) {
+                  ensurePayloadIsMutable();
+                  payload_.add(m);
+                } else {
+                  payloadBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -3429,7 +3480,18 @@ public AtomicWrite parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new AtomicWrite(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -3491,7 +3553,7 @@ org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySna
   /**
    * Protobuf type {@code AtLeastOnceDeliverySnapshot}
    */
-  public  static final class AtLeastOnceDeliverySnapshot extends
+  public static final class AtLeastOnceDeliverySnapshot extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:AtLeastOnceDeliverySnapshot)
       AtLeastOnceDeliverySnapshotOrBuilder {
@@ -3511,66 +3573,6 @@ protected java.lang.Object newInstance(
       return new AtLeastOnceDeliverySnapshot();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private AtLeastOnceDeliverySnapshot(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              currentDeliveryId_ = input.readInt64();
-              break;
-            }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                unconfirmedDeliveries_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              unconfirmedDeliveries_.add(
-                  input.readMessage(org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          unconfirmedDeliveries_ = java.util.Collections.unmodifiableList(unconfirmedDeliveries_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.persistence.serialization.MessageFormats.internal_static_AtLeastOnceDeliverySnapshot_descriptor;
@@ -3634,7 +3636,7 @@ public interface UnconfirmedDeliveryOrBuilder extends
     /**
      * Protobuf type {@code AtLeastOnceDeliverySnapshot.UnconfirmedDelivery}
      */
-    public  static final class UnconfirmedDelivery extends
+    public static final class UnconfirmedDelivery extends
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:AtLeastOnceDeliverySnapshot.UnconfirmedDelivery)
         UnconfirmedDeliveryOrBuilder {
@@ -3654,73 +3656,6 @@ protected java.lang.Object newInstance(
         return new UnconfirmedDelivery();
       }
 
-      @java.lang.Override
-      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private UnconfirmedDelivery(
-          org.apache.pekko.protobufv3.internal.CodedInputStream input,
-          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 8: {
-                bitField0_ |= 0x00000001;
-                deliveryId_ = input.readInt64();
-                break;
-              }
-              case 18: {
-                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000002;
-                destination_ = bs;
-                break;
-              }
-              case 26: {
-                org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000004) != 0)) {
-                  subBuilder = payload_.toBuilder();
-                }
-                payload_ = input.readMessage(org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(payload_);
-                  payload_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000004;
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.persistence.serialization.MessageFormats.internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_descriptor;
@@ -3736,11 +3671,12 @@ private UnconfirmedDelivery(
 
       private int bitField0_;
       public static final int DELIVERYID_FIELD_NUMBER = 1;
-      private long deliveryId_;
+      private long deliveryId_ = 0L;
       /**
        * required int64 deliveryId = 1;
        * @return Whether the deliveryId field is set.
        */
+      @java.lang.Override
       public boolean hasDeliveryId() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -3748,16 +3684,19 @@ public boolean hasDeliveryId() {
        * required int64 deliveryId = 1;
        * @return The deliveryId.
        */
+      @java.lang.Override
       public long getDeliveryId() {
         return deliveryId_;
       }
 
       public static final int DESTINATION_FIELD_NUMBER = 2;
-      private volatile java.lang.Object destination_;
+      @SuppressWarnings("serial")
+      private volatile java.lang.Object destination_ = "";
       /**
        * required string destination = 2;
        * @return Whether the destination field is set.
        */
+      @java.lang.Override
       public boolean hasDestination() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -3765,6 +3704,7 @@ public boolean hasDestination() {
        * required string destination = 2;
        * @return The destination.
        */
+      @java.lang.Override
       public java.lang.String getDestination() {
         java.lang.Object ref = destination_;
         if (ref instanceof java.lang.String) {
@@ -3783,6 +3723,7 @@ public java.lang.String getDestination() {
        * required string destination = 2;
        * @return The bytes for destination.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString
           getDestinationBytes() {
         java.lang.Object ref = destination_;
@@ -3803,6 +3744,7 @@ public java.lang.String getDestination() {
        * required .PersistentPayload payload = 3;
        * @return Whether the payload field is set.
        */
+      @java.lang.Override
       public boolean hasPayload() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -3810,12 +3752,14 @@ public boolean hasPayload() {
        * required .PersistentPayload payload = 3;
        * @return The payload.
        */
+      @java.lang.Override
       public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload getPayload() {
         return payload_ == null ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : payload_;
       }
       /**
        * required .PersistentPayload payload = 3;
        */
+      @java.lang.Override
       public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder getPayloadOrBuilder() {
         return payload_ == null ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : payload_;
       }
@@ -3859,7 +3803,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
         if (((bitField0_ & 0x00000004) != 0)) {
           output.writeMessage(3, getPayload());
         }
-        unknownFields.writeTo(output);
+        getUnknownFields().writeTo(output);
       }
 
       @java.lang.Override
@@ -3879,7 +3823,7 @@ public int getSerializedSize() {
           size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(3, getPayload());
         }
-        size += unknownFields.getSerializedSize();
+        size += getUnknownFields().getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -3909,7 +3853,7 @@ public boolean equals(final java.lang.Object obj) {
           if (!getPayload()
               .equals(other.getPayload())) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
         return true;
       }
 
@@ -3933,7 +3877,7 @@ public int hashCode() {
           hash = (37 * hash) + PAYLOAD_FIELD_NUMBER;
           hash = (53 * hash) + getPayload().hashCode();
         }
-        hash = (29 * hash) + unknownFields.hashCode();
+        hash = (29 * hash) + getUnknownFields().hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -3982,11 +3926,13 @@ public static org.apache.pekko.persistence.serialization.MessageFormats.AtLeastO
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
+
       public static org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
+
       public static org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery parseDelimitedFrom(
           java.io.InputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -4067,16 +4013,14 @@ private void maybeForceBuilderInitialization() {
         @java.lang.Override
         public Builder clear() {
           super.clear();
+          bitField0_ = 0;
           deliveryId_ = 0L;
-          bitField0_ = (bitField0_ & ~0x00000001);
           destination_ = "";
-          bitField0_ = (bitField0_ & ~0x00000002);
-          if (payloadBuilder_ == null) {
-            payload_ = null;
-          } else {
-            payloadBuilder_.clear();
+          payload_ = null;
+          if (payloadBuilder_ != null) {
+            payloadBuilder_.dispose();
+            payloadBuilder_ = null;
           }
-          bitField0_ = (bitField0_ & ~0x00000004);
           return this;
         }
 
@@ -4103,6 +4047,12 @@ public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeli
         @java.lang.Override
         public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery buildPartial() {
           org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery result = new org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery(this);
+          if (bitField0_ != 0) { buildPartial0(result); }
+          onBuilt();
+          return result;
+        }
+
+        private void buildPartial0(org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery result) {
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -4110,20 +4060,16 @@ public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeli
             to_bitField0_ |= 0x00000001;
           }
           if (((from_bitField0_ & 0x00000002) != 0)) {
+            result.destination_ = destination_;
             to_bitField0_ |= 0x00000002;
           }
-          result.destination_ = destination_;
           if (((from_bitField0_ & 0x00000004) != 0)) {
-            if (payloadBuilder_ == null) {
-              result.payload_ = payload_;
-            } else {
-              result.payload_ = payloadBuilder_.build();
-            }
+            result.payload_ = payloadBuilder_ == null
+                ? payload_
+                : payloadBuilder_.build();
             to_bitField0_ |= 0x00000004;
           }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
+          result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -4174,14 +4120,14 @@ public Builder mergeFrom(org.apache.pekko.persistence.serialization.MessageForma
             setDeliveryId(other.getDeliveryId());
           }
           if (other.hasDestination()) {
-            bitField0_ |= 0x00000002;
             destination_ = other.destination_;
+            bitField0_ |= 0x00000002;
             onChanged();
           }
           if (other.hasPayload()) {
             mergePayload(other.getPayload());
           }
-          this.mergeUnknownFields(other.unknownFields);
+          this.mergeUnknownFields(other.getUnknownFields());
           onChanged();
           return this;
         }
@@ -4208,17 +4154,47 @@ public Builder mergeFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery parsedMessage = null;
+          if (extensionRegistry == null) {
+            throw new java.lang.NullPointerException();
+          }
           try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+            boolean done = false;
+            while (!done) {
+              int tag = input.readTag();
+              switch (tag) {
+                case 0:
+                  done = true;
+                  break;
+                case 8: {
+                  deliveryId_ = input.readInt64();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 8
+                case 18: {
+                  destination_ = input.readBytes();
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 18
+                case 26: {
+                  input.readMessage(
+                      getPayloadFieldBuilder().getBuilder(),
+                      extensionRegistry);
+                  bitField0_ |= 0x00000004;
+                  break;
+                } // case 26
+                default: {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+              } // switch (tag)
+            } // while (!done)
           } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
+            onChanged();
+          } // finally
           return this;
         }
         private int bitField0_;
@@ -4228,6 +4204,7 @@ public Builder mergeFrom(
          * required int64 deliveryId = 1;
          * @return Whether the deliveryId field is set.
          */
+        @java.lang.Override
         public boolean hasDeliveryId() {
           return ((bitField0_ & 0x00000001) != 0);
         }
@@ -4235,6 +4212,7 @@ public boolean hasDeliveryId() {
          * required int64 deliveryId = 1;
          * @return The deliveryId.
          */
+        @java.lang.Override
         public long getDeliveryId() {
           return deliveryId_;
         }
@@ -4244,8 +4222,9 @@ public long getDeliveryId() {
          * @return This builder for chaining.
          */
         public Builder setDeliveryId(long value) {
-          bitField0_ |= 0x00000001;
+
           deliveryId_ = value;
+          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -4310,11 +4289,9 @@ public java.lang.String getDestination() {
          */
         public Builder setDestination(
             java.lang.String value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+          if (value == null) { throw new NullPointerException(); }
           destination_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -4323,8 +4300,8 @@ public Builder setDestination(
          * @return This builder for chaining.
          */
         public Builder clearDestination() {
-          bitField0_ = (bitField0_ & ~0x00000002);
           destination_ = getDefaultInstance().getDestination();
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
           return this;
         }
@@ -4335,11 +4312,9 @@ public Builder clearDestination() {
          */
         public Builder setDestinationBytes(
             org.apache.pekko.protobufv3.internal.ByteString value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+          if (value == null) { throw new NullPointerException(); }
           destination_ = value;
+          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -4374,11 +4349,11 @@ public Builder setPayload(org.apache.pekko.persistence.serialization.MessageForm
               throw new NullPointerException();
             }
             payload_ = value;
-            onChanged();
           } else {
             payloadBuilder_.setMessage(value);
           }
           bitField0_ |= 0x00000004;
+          onChanged();
           return this;
         }
         /**
@@ -4388,11 +4363,11 @@ public Builder setPayload(
             org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder builderForValue) {
           if (payloadBuilder_ == null) {
             payload_ = builderForValue.build();
-            onChanged();
           } else {
             payloadBuilder_.setMessage(builderForValue.build());
           }
           bitField0_ |= 0x00000004;
+          onChanged();
           return this;
         }
         /**
@@ -4401,31 +4376,32 @@ public Builder setPayload(
         public Builder mergePayload(org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload value) {
           if (payloadBuilder_ == null) {
             if (((bitField0_ & 0x00000004) != 0) &&
-                payload_ != null &&
-                payload_ != org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance()) {
-              payload_ =
-                org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.newBuilder(payload_).mergeFrom(value).buildPartial();
+              payload_ != null &&
+              payload_ != org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance()) {
+              getPayloadBuilder().mergeFrom(value);
             } else {
               payload_ = value;
             }
-            onChanged();
           } else {
             payloadBuilder_.mergeFrom(value);
           }
-          bitField0_ |= 0x00000004;
+          if (payload_ != null) {
+            bitField0_ |= 0x00000004;
+            onChanged();
+          }
           return this;
         }
         /**
          * required .PersistentPayload payload = 3;
          */
         public Builder clearPayload() {
-          if (payloadBuilder_ == null) {
-            payload_ = null;
-            onChanged();
-          } else {
-            payloadBuilder_.clear();
-          }
           bitField0_ = (bitField0_ & ~0x00000004);
+          payload_ = null;
+          if (payloadBuilder_ != null) {
+            payloadBuilder_.dispose();
+            payloadBuilder_ = null;
+          }
+          onChanged();
           return this;
         }
         /**
@@ -4496,7 +4472,18 @@ public UnconfirmedDelivery parsePartialFrom(
             org.apache.pekko.protobufv3.internal.CodedInputStream input,
             org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-          return new UnconfirmedDelivery(input, extensionRegistry);
+          Builder builder = newBuilder();
+          try {
+            builder.mergeFrom(input, extensionRegistry);
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            throw e.setUnfinishedMessage(builder.buildPartial());
+          } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+          } catch (java.io.IOException e) {
+            throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                .setUnfinishedMessage(builder.buildPartial());
+          }
+          return builder.buildPartial();
         }
       };
 
@@ -4518,11 +4505,12 @@ public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeli
 
     private int bitField0_;
     public static final int CURRENTDELIVERYID_FIELD_NUMBER = 1;
-    private long currentDeliveryId_;
+    private long currentDeliveryId_ = 0L;
     /**
      * required int64 currentDeliveryId = 1;
      * @return Whether the currentDeliveryId field is set.
      */
+    @java.lang.Override
     public boolean hasCurrentDeliveryId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -4530,21 +4518,25 @@ public boolean hasCurrentDeliveryId() {
      * required int64 currentDeliveryId = 1;
      * @return The currentDeliveryId.
      */
+    @java.lang.Override
     public long getCurrentDeliveryId() {
       return currentDeliveryId_;
     }
 
     public static final int UNCONFIRMEDDELIVERIES_FIELD_NUMBER = 2;
+    @SuppressWarnings("serial")
     private java.util.List unconfirmedDeliveries_;
     /**
      * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
      */
+    @java.lang.Override
     public java.util.List getUnconfirmedDeliveriesList() {
       return unconfirmedDeliveries_;
     }
     /**
      * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
      */
+    @java.lang.Override
     public java.util.List 
         getUnconfirmedDeliveriesOrBuilderList() {
       return unconfirmedDeliveries_;
@@ -4552,18 +4544,21 @@ public java.util.Listrepeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
      */
+    @java.lang.Override
     public int getUnconfirmedDeliveriesCount() {
       return unconfirmedDeliveries_.size();
     }
     /**
      * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery getUnconfirmedDeliveries(int index) {
       return unconfirmedDeliveries_.get(index);
     }
     /**
      * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDeliveryOrBuilder getUnconfirmedDeliveriesOrBuilder(
         int index) {
       return unconfirmedDeliveries_.get(index);
@@ -4599,7 +4594,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < unconfirmedDeliveries_.size(); i++) {
         output.writeMessage(2, unconfirmedDeliveries_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -4616,7 +4611,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, unconfirmedDeliveries_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4638,7 +4633,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getUnconfirmedDeliveriesList()
           .equals(other.getUnconfirmedDeliveriesList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -4658,7 +4653,7 @@ public int hashCode() {
         hash = (37 * hash) + UNCONFIRMEDDELIVERIES_FIELD_NUMBER;
         hash = (53 * hash) + getUnconfirmedDeliveriesList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4707,11 +4702,13 @@ public static org.apache.pekko.persistence.serialization.MessageFormats.AtLeastO
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -4775,31 +4772,26 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getUnconfirmedDeliveriesFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         currentDeliveryId_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         if (unconfirmedDeliveriesBuilder_ == null) {
           unconfirmedDeliveries_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
+          unconfirmedDeliveries_ = null;
           unconfirmedDeliveriesBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -4826,12 +4818,13 @@ public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeli
       @java.lang.Override
       public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot buildPartial() {
         org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot result = new org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.currentDeliveryId_ = currentDeliveryId_;
-          to_bitField0_ |= 0x00000001;
-        }
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot result) {
         if (unconfirmedDeliveriesBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
             unconfirmedDeliveries_ = java.util.Collections.unmodifiableList(unconfirmedDeliveries_);
@@ -4841,9 +4834,16 @@ public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeli
         } else {
           result.unconfirmedDeliveries_ = unconfirmedDeliveriesBuilder_.build();
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.currentDeliveryId_ = currentDeliveryId_;
+          to_bitField0_ |= 0x00000001;
+        }
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -4919,7 +4919,7 @@ public Builder mergeFrom(org.apache.pekko.persistence.serialization.MessageForma
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -4942,17 +4942,48 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                currentDeliveryId_ = input.readInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 18: {
+                org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery m =
+                    input.readMessage(
+                        org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.PARSER,
+                        extensionRegistry);
+                if (unconfirmedDeliveriesBuilder_ == null) {
+                  ensureUnconfirmedDeliveriesIsMutable();
+                  unconfirmedDeliveries_.add(m);
+                } else {
+                  unconfirmedDeliveriesBuilder_.addMessage(m);
+                }
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -4962,6 +4993,7 @@ public Builder mergeFrom(
        * required int64 currentDeliveryId = 1;
        * @return Whether the currentDeliveryId field is set.
        */
+      @java.lang.Override
       public boolean hasCurrentDeliveryId() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -4969,6 +5001,7 @@ public boolean hasCurrentDeliveryId() {
        * required int64 currentDeliveryId = 1;
        * @return The currentDeliveryId.
        */
+      @java.lang.Override
       public long getCurrentDeliveryId() {
         return currentDeliveryId_;
       }
@@ -4978,8 +5011,9 @@ public long getCurrentDeliveryId() {
        * @return This builder for chaining.
        */
       public Builder setCurrentDeliveryId(long value) {
-        bitField0_ |= 0x00000001;
+
         currentDeliveryId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -5266,7 +5300,18 @@ public AtLeastOnceDeliverySnapshot parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new AtLeastOnceDeliverySnapshot(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -5350,7 +5395,7 @@ public interface PersistentStateChangeEventOrBuilder extends
   /**
    * Protobuf type {@code PersistentStateChangeEvent}
    */
-  public  static final class PersistentStateChangeEvent extends
+  public static final class PersistentStateChangeEvent extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:PersistentStateChangeEvent)
       PersistentStateChangeEventOrBuilder {
@@ -5371,66 +5416,6 @@ protected java.lang.Object newInstance(
       return new PersistentStateChangeEvent();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private PersistentStateChangeEvent(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              stateIdentifier_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              timeout_ = bs;
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              timeoutNanos_ = input.readInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.persistence.serialization.MessageFormats.internal_static_PersistentStateChangeEvent_descriptor;
@@ -5446,11 +5431,13 @@ private PersistentStateChangeEvent(
 
     private int bitField0_;
     public static final int STATEIDENTIFIER_FIELD_NUMBER = 1;
-    private volatile java.lang.Object stateIdentifier_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object stateIdentifier_ = "";
     /**
      * required string stateIdentifier = 1;
      * @return Whether the stateIdentifier field is set.
      */
+    @java.lang.Override
     public boolean hasStateIdentifier() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -5458,6 +5445,7 @@ public boolean hasStateIdentifier() {
      * required string stateIdentifier = 1;
      * @return The stateIdentifier.
      */
+    @java.lang.Override
     public java.lang.String getStateIdentifier() {
       java.lang.Object ref = stateIdentifier_;
       if (ref instanceof java.lang.String) {
@@ -5476,6 +5464,7 @@ public java.lang.String getStateIdentifier() {
      * required string stateIdentifier = 1;
      * @return The bytes for stateIdentifier.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getStateIdentifierBytes() {
       java.lang.Object ref = stateIdentifier_;
@@ -5491,7 +5480,8 @@ public java.lang.String getStateIdentifier() {
     }
 
     public static final int TIMEOUT_FIELD_NUMBER = 2;
-    private volatile java.lang.Object timeout_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object timeout_ = "";
     /**
      * 
      *not used in new records from Akka 2.4.5
@@ -5500,6 +5490,7 @@ public java.lang.String getStateIdentifier() {
      * optional string timeout = 2;
      * @return Whether the timeout field is set.
      */
+    @java.lang.Override
     public boolean hasTimeout() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -5511,6 +5502,7 @@ public boolean hasTimeout() {
      * optional string timeout = 2;
      * @return The timeout.
      */
+    @java.lang.Override
     public java.lang.String getTimeout() {
       java.lang.Object ref = timeout_;
       if (ref instanceof java.lang.String) {
@@ -5533,6 +5525,7 @@ public java.lang.String getTimeout() {
      * optional string timeout = 2;
      * @return The bytes for timeout.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getTimeoutBytes() {
       java.lang.Object ref = timeout_;
@@ -5548,11 +5541,12 @@ public java.lang.String getTimeout() {
     }
 
     public static final int TIMEOUTNANOS_FIELD_NUMBER = 3;
-    private long timeoutNanos_;
+    private long timeoutNanos_ = 0L;
     /**
      * optional int64 timeoutNanos = 3;
      * @return Whether the timeoutNanos field is set.
      */
+    @java.lang.Override
     public boolean hasTimeoutNanos() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -5560,6 +5554,7 @@ public boolean hasTimeoutNanos() {
      * optional int64 timeoutNanos = 3;
      * @return The timeoutNanos.
      */
+    @java.lang.Override
     public long getTimeoutNanos() {
       return timeoutNanos_;
     }
@@ -5591,7 +5586,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeInt64(3, timeoutNanos_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -5610,7 +5605,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(3, timeoutNanos_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5640,7 +5635,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getTimeoutNanos()
             != other.getTimeoutNanos()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -5664,7 +5659,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getTimeoutNanos());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -5713,11 +5708,13 @@ public static org.apache.pekko.persistence.serialization.MessageFormats.Persiste
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -5781,28 +5778,21 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         stateIdentifier_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         timeout_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         timeoutNanos_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -5829,23 +5819,27 @@ public org.apache.pekko.persistence.serialization.MessageFormats.PersistentState
       @java.lang.Override
       public org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent buildPartial() {
         org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent result = new org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.stateIdentifier_ = stateIdentifier_;
           to_bitField0_ |= 0x00000001;
         }
-        result.stateIdentifier_ = stateIdentifier_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.timeout_ = timeout_;
           to_bitField0_ |= 0x00000002;
         }
-        result.timeout_ = timeout_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.timeoutNanos_ = timeoutNanos_;
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -5893,19 +5887,19 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent other) {
         if (other == org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent.getDefaultInstance()) return this;
         if (other.hasStateIdentifier()) {
-          bitField0_ |= 0x00000001;
           stateIdentifier_ = other.stateIdentifier_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasTimeout()) {
-          bitField0_ |= 0x00000002;
           timeout_ = other.timeout_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasTimeoutNanos()) {
           setTimeoutNanos(other.getTimeoutNanos());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -5923,17 +5917,45 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                stateIdentifier_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                timeout_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 24: {
+                timeoutNanos_ = input.readInt64();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -5988,11 +6010,9 @@ public java.lang.String getStateIdentifier() {
        */
       public Builder setStateIdentifier(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         stateIdentifier_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -6001,8 +6021,8 @@ public Builder setStateIdentifier(
        * @return This builder for chaining.
        */
       public Builder clearStateIdentifier() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         stateIdentifier_ = getDefaultInstance().getStateIdentifier();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -6013,11 +6033,9 @@ public Builder clearStateIdentifier() {
        */
       public Builder setStateIdentifierBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         stateIdentifier_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -6088,11 +6106,9 @@ public java.lang.String getTimeout() {
        */
       public Builder setTimeout(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         timeout_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -6105,8 +6121,8 @@ public Builder setTimeout(
        * @return This builder for chaining.
        */
       public Builder clearTimeout() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         timeout_ = getDefaultInstance().getTimeout();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -6121,11 +6137,9 @@ public Builder clearTimeout() {
        */
       public Builder setTimeoutBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         timeout_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -6135,6 +6149,7 @@ public Builder setTimeoutBytes(
        * optional int64 timeoutNanos = 3;
        * @return Whether the timeoutNanos field is set.
        */
+      @java.lang.Override
       public boolean hasTimeoutNanos() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -6142,6 +6157,7 @@ public boolean hasTimeoutNanos() {
        * optional int64 timeoutNanos = 3;
        * @return The timeoutNanos.
        */
+      @java.lang.Override
       public long getTimeoutNanos() {
         return timeoutNanos_;
       }
@@ -6151,8 +6167,9 @@ public long getTimeoutNanos() {
        * @return This builder for chaining.
        */
       public Builder setTimeoutNanos(long value) {
-        bitField0_ |= 0x00000004;
+
         timeoutNanos_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -6199,7 +6216,18 @@ public PersistentStateChangeEvent parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new PersistentStateChangeEvent(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -6269,7 +6297,7 @@ public interface PersistentFSMSnapshotOrBuilder extends
   /**
    * Protobuf type {@code PersistentFSMSnapshot}
    */
-  public  static final class PersistentFSMSnapshot extends
+  public static final class PersistentFSMSnapshot extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:PersistentFSMSnapshot)
       PersistentFSMSnapshotOrBuilder {
@@ -6289,73 +6317,6 @@ protected java.lang.Object newInstance(
       return new PersistentFSMSnapshot();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private PersistentFSMSnapshot(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              stateIdentifier_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = data_.toBuilder();
-              }
-              data_ = input.readMessage(org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(data_);
-                data_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              timeoutNanos_ = input.readInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.persistence.serialization.MessageFormats.internal_static_PersistentFSMSnapshot_descriptor;
@@ -6371,11 +6332,13 @@ private PersistentFSMSnapshot(
 
     private int bitField0_;
     public static final int STATEIDENTIFIER_FIELD_NUMBER = 1;
-    private volatile java.lang.Object stateIdentifier_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object stateIdentifier_ = "";
     /**
      * required string stateIdentifier = 1;
      * @return Whether the stateIdentifier field is set.
      */
+    @java.lang.Override
     public boolean hasStateIdentifier() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -6383,6 +6346,7 @@ public boolean hasStateIdentifier() {
      * required string stateIdentifier = 1;
      * @return The stateIdentifier.
      */
+    @java.lang.Override
     public java.lang.String getStateIdentifier() {
       java.lang.Object ref = stateIdentifier_;
       if (ref instanceof java.lang.String) {
@@ -6401,6 +6365,7 @@ public java.lang.String getStateIdentifier() {
      * required string stateIdentifier = 1;
      * @return The bytes for stateIdentifier.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getStateIdentifierBytes() {
       java.lang.Object ref = stateIdentifier_;
@@ -6421,6 +6386,7 @@ public java.lang.String getStateIdentifier() {
      * required .PersistentPayload data = 2;
      * @return Whether the data field is set.
      */
+    @java.lang.Override
     public boolean hasData() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -6428,22 +6394,25 @@ public boolean hasData() {
      * required .PersistentPayload data = 2;
      * @return The data.
      */
+    @java.lang.Override
     public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload getData() {
       return data_ == null ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : data_;
     }
     /**
      * required .PersistentPayload data = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder getDataOrBuilder() {
       return data_ == null ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : data_;
     }
 
     public static final int TIMEOUTNANOS_FIELD_NUMBER = 3;
-    private long timeoutNanos_;
+    private long timeoutNanos_ = 0L;
     /**
      * optional int64 timeoutNanos = 3;
      * @return Whether the timeoutNanos field is set.
      */
+    @java.lang.Override
     public boolean hasTimeoutNanos() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -6451,6 +6420,7 @@ public boolean hasTimeoutNanos() {
      * optional int64 timeoutNanos = 3;
      * @return The timeoutNanos.
      */
+    @java.lang.Override
     public long getTimeoutNanos() {
       return timeoutNanos_;
     }
@@ -6490,7 +6460,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeInt64(3, timeoutNanos_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -6510,7 +6480,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(3, timeoutNanos_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -6540,7 +6510,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getTimeoutNanos()
             != other.getTimeoutNanos()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -6564,7 +6534,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getTimeoutNanos());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -6613,11 +6583,13 @@ public static org.apache.pekko.persistence.serialization.MessageFormats.Persiste
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -6698,16 +6670,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         stateIdentifier_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (dataBuilder_ == null) {
-          data_ = null;
-        } else {
-          dataBuilder_.clear();
+        data_ = null;
+        if (dataBuilder_ != null) {
+          dataBuilder_.dispose();
+          dataBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         timeoutNanos_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -6734,27 +6704,29 @@ public org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSn
       @java.lang.Override
       public org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot buildPartial() {
         org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot result = new org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.stateIdentifier_ = stateIdentifier_;
           to_bitField0_ |= 0x00000001;
         }
-        result.stateIdentifier_ = stateIdentifier_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (dataBuilder_ == null) {
-            result.data_ = data_;
-          } else {
-            result.data_ = dataBuilder_.build();
-          }
+          result.data_ = dataBuilder_ == null
+              ? data_
+              : dataBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.timeoutNanos_ = timeoutNanos_;
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -6802,8 +6774,8 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot other) {
         if (other == org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot.getDefaultInstance()) return this;
         if (other.hasStateIdentifier()) {
-          bitField0_ |= 0x00000001;
           stateIdentifier_ = other.stateIdentifier_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasData()) {
@@ -6812,7 +6784,7 @@ public Builder mergeFrom(org.apache.pekko.persistence.serialization.MessageForma
         if (other.hasTimeoutNanos()) {
           setTimeoutNanos(other.getTimeoutNanos());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -6836,17 +6808,47 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                stateIdentifier_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getDataFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 24: {
+                timeoutNanos_ = input.readInt64();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -6901,11 +6903,9 @@ public java.lang.String getStateIdentifier() {
        */
       public Builder setStateIdentifier(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         stateIdentifier_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -6914,8 +6914,8 @@ public Builder setStateIdentifier(
        * @return This builder for chaining.
        */
       public Builder clearStateIdentifier() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         stateIdentifier_ = getDefaultInstance().getStateIdentifier();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -6926,11 +6926,9 @@ public Builder clearStateIdentifier() {
        */
       public Builder setStateIdentifierBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         stateIdentifier_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -6965,11 +6963,11 @@ public Builder setData(org.apache.pekko.persistence.serialization.MessageFormats
             throw new NullPointerException();
           }
           data_ = value;
-          onChanged();
         } else {
           dataBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -6979,11 +6977,11 @@ public Builder setData(
           org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder builderForValue) {
         if (dataBuilder_ == null) {
           data_ = builderForValue.build();
-          onChanged();
         } else {
           dataBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -6992,31 +6990,32 @@ public Builder setData(
       public Builder mergeData(org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload value) {
         if (dataBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              data_ != null &&
-              data_ != org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance()) {
-            data_ =
-              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.newBuilder(data_).mergeFrom(value).buildPartial();
+            data_ != null &&
+            data_ != org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance()) {
+            getDataBuilder().mergeFrom(value);
           } else {
             data_ = value;
           }
-          onChanged();
         } else {
           dataBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (data_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .PersistentPayload data = 2;
        */
       public Builder clearData() {
-        if (dataBuilder_ == null) {
-          data_ = null;
-          onChanged();
-        } else {
-          dataBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        data_ = null;
+        if (dataBuilder_ != null) {
+          dataBuilder_.dispose();
+          dataBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -7060,6 +7059,7 @@ public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPaylo
        * optional int64 timeoutNanos = 3;
        * @return Whether the timeoutNanos field is set.
        */
+      @java.lang.Override
       public boolean hasTimeoutNanos() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -7067,6 +7067,7 @@ public boolean hasTimeoutNanos() {
        * optional int64 timeoutNanos = 3;
        * @return The timeoutNanos.
        */
+      @java.lang.Override
       public long getTimeoutNanos() {
         return timeoutNanos_;
       }
@@ -7076,8 +7077,9 @@ public long getTimeoutNanos() {
        * @return This builder for chaining.
        */
       public Builder setTimeoutNanos(long value) {
-        bitField0_ |= 0x00000004;
+
         timeoutNanos_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -7124,7 +7126,18 @@ public PersistentFSMSnapshot parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new PersistentFSMSnapshot(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index c66ae8ce1ce..411258110a3 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -19,8 +19,10 @@ object Dependencies {
   import DependencyHelpers._
 
   object Protobuf {
-    val protobufJavaVersion = "3.25.5"
-    val protocVersion = protobufJavaVersion
+    // https://protobuf.dev/support/version-support/
+    // protobuf-java 3.25 corresponds with protoc 22.x-25.x
+    val protobufJavaVersion = "3.25.6"
+    val protocVersion = "25.6"
   }
 
   lazy val java8CompatVersion = settingKey[String]("The version of scala-java8-compat to use.")
diff --git a/project/Protobuf.scala b/project/Protobuf.scala
index eac49bf61d8..a0111375714 100644
--- a/project/Protobuf.scala
+++ b/project/Protobuf.scala
@@ -31,7 +31,7 @@ object Protobuf {
     "The path that contain additional *.proto files that can be imported.")
   lazy val protoc = SettingKey[String]("protobuf-protoc", "The path and name of the protoc executable.")
   lazy val protocVersion = SettingKey[String]("protobuf-protoc-version", "The version of the protoc executable.")
-  lazy val generate = TaskKey[Unit]("protobuf-generate", "Compile the protobuf sources and do all processing.")
+  lazy val protobufGenerate = TaskKey[Unit]("protobufGenerate", "Compile the protobuf sources and do all processing.")
 
   lazy val settings: Seq[Setting[_]] = Seq(
     paths := Seq((Compile / sourceDirectory).value, (Test / sourceDirectory).value).map(_ / "protobuf"),
@@ -41,7 +41,7 @@ object Protobuf {
     Compile / unmanagedJars += (LocalProject("protobuf-v3") / Compile / packageBin).value,
     protoc := "protoc",
     protocVersion := Dependencies.Protobuf.protocVersion,
-    generate := {
+    protobufGenerate := {
       val sourceDirs = paths.value
       val targetDirs = outputPaths.value
       val log = streams.value.log
@@ -73,7 +73,20 @@ object Protobuf {
               tmp,
               dst,
               _ => true,
-              transformFile(
+              transformFile("""/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * license agreements; and to You under the Apache License, version 2.0:
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * This file is part of the Apache Pekko project, which was derived from Akka.
+ */
+
+/*
+ * Copyright (C) 2019-2022 Lightbend Inc. 
+ */
+
+""",
                 _.replace("com.google.protobuf", "org.apache.pekko.protobufv3.internal")
                   // this is the one thing that protobufGenerate doesn't fully qualify and causes
                   // api doc generation to fail
@@ -174,10 +187,11 @@ object Protobuf {
   /**
    * Transform a file, line by line.
    */
-  def transformFile(transform: String => String)(source: File, target: File): Unit = {
+  def transformFile(header: String, transform: String => String)(source: File, target: File): Unit = {
     IO.reader(source) { reader =>
       IO.writer(target, "", IO.defaultCharset) { writer =>
         val pw = new PrintWriter(writer)
+        pw.print(header)
         IO.foreachLine(reader) { line =>
           pw.println(transform(line))
         }
diff --git a/remote-tests/src/test/java/org/apache/pekko/remote/artery/protobuf/TestMessages.java b/remote-tests/src/test/java/org/apache/pekko/remote/artery/protobuf/TestMessages.java
index 696a149b376..bbf9c9f0c60 100644
--- a/remote-tests/src/test/java/org/apache/pekko/remote/artery/protobuf/TestMessages.java
+++ b/remote-tests/src/test/java/org/apache/pekko/remote/artery/protobuf/TestMessages.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2020-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: TestMessages.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.remote.artery.protobuf;
 
 public final class TestMessages {
@@ -125,7 +126,7 @@ org.apache.pekko.remote.artery.protobuf.TestMessages.ItemOrBuilder getItemsOrBui
   /**
    * Protobuf type {@code TestMessage}
    */
-  public  static final class TestMessage extends
+  public static final class TestMessage extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:TestMessage)
       TestMessageOrBuilder {
@@ -148,88 +149,6 @@ protected java.lang.Object newInstance(
       return new TestMessage();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private TestMessage(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              id_ = input.readUInt64();
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              name_ = bs;
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              status_ = input.readBool();
-              break;
-            }
-            case 34: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000008;
-              description_ = bs;
-              break;
-            }
-            case 42: {
-              bitField0_ |= 0x00000010;
-              payload_ = input.readBytes();
-              break;
-            }
-            case 50: {
-              if (!((mutable_bitField0_ & 0x00000020) != 0)) {
-                items_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000020;
-              }
-              items_.add(
-                  input.readMessage(org.apache.pekko.remote.artery.protobuf.TestMessages.Item.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000020) != 0)) {
-          items_ = java.util.Collections.unmodifiableList(items_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.artery.protobuf.TestMessages.internal_static_TestMessage_descriptor;
@@ -245,11 +164,12 @@ private TestMessage(
 
     private int bitField0_;
     public static final int ID_FIELD_NUMBER = 1;
-    private long id_;
+    private long id_ = 0L;
     /**
      * required uint64 id = 1;
      * @return Whether the id field is set.
      */
+    @java.lang.Override
     public boolean hasId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -257,16 +177,19 @@ public boolean hasId() {
      * required uint64 id = 1;
      * @return The id.
      */
+    @java.lang.Override
     public long getId() {
       return id_;
     }
 
     public static final int NAME_FIELD_NUMBER = 2;
-    private volatile java.lang.Object name_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object name_ = "";
     /**
      * required string name = 2;
      * @return Whether the name field is set.
      */
+    @java.lang.Override
     public boolean hasName() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -274,6 +197,7 @@ public boolean hasName() {
      * required string name = 2;
      * @return The name.
      */
+    @java.lang.Override
     public java.lang.String getName() {
       java.lang.Object ref = name_;
       if (ref instanceof java.lang.String) {
@@ -292,6 +216,7 @@ public java.lang.String getName() {
      * required string name = 2;
      * @return The bytes for name.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getNameBytes() {
       java.lang.Object ref = name_;
@@ -307,11 +232,12 @@ public java.lang.String getName() {
     }
 
     public static final int STATUS_FIELD_NUMBER = 3;
-    private boolean status_;
+    private boolean status_ = false;
     /**
      * required bool status = 3;
      * @return Whether the status field is set.
      */
+    @java.lang.Override
     public boolean hasStatus() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -319,16 +245,19 @@ public boolean hasStatus() {
      * required bool status = 3;
      * @return The status.
      */
+    @java.lang.Override
     public boolean getStatus() {
       return status_;
     }
 
     public static final int DESCRIPTION_FIELD_NUMBER = 4;
-    private volatile java.lang.Object description_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object description_ = "";
     /**
      * optional string description = 4;
      * @return Whether the description field is set.
      */
+    @java.lang.Override
     public boolean hasDescription() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -336,6 +265,7 @@ public boolean hasDescription() {
      * optional string description = 4;
      * @return The description.
      */
+    @java.lang.Override
     public java.lang.String getDescription() {
       java.lang.Object ref = description_;
       if (ref instanceof java.lang.String) {
@@ -354,6 +284,7 @@ public java.lang.String getDescription() {
      * optional string description = 4;
      * @return The bytes for description.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getDescriptionBytes() {
       java.lang.Object ref = description_;
@@ -369,11 +300,12 @@ public java.lang.String getDescription() {
     }
 
     public static final int PAYLOAD_FIELD_NUMBER = 5;
-    private org.apache.pekko.protobufv3.internal.ByteString payload_;
+    private org.apache.pekko.protobufv3.internal.ByteString payload_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * optional bytes payload = 5;
      * @return Whether the payload field is set.
      */
+    @java.lang.Override
     public boolean hasPayload() {
       return ((bitField0_ & 0x00000010) != 0);
     }
@@ -381,21 +313,25 @@ public boolean hasPayload() {
      * optional bytes payload = 5;
      * @return The payload.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getPayload() {
       return payload_;
     }
 
     public static final int ITEMS_FIELD_NUMBER = 6;
+    @SuppressWarnings("serial")
     private java.util.List items_;
     /**
      * repeated .Item items = 6;
      */
+    @java.lang.Override
     public java.util.List getItemsList() {
       return items_;
     }
     /**
      * repeated .Item items = 6;
      */
+    @java.lang.Override
     public java.util.List 
         getItemsOrBuilderList() {
       return items_;
@@ -403,18 +339,21 @@ public java.util.List
     /**
      * repeated .Item items = 6;
      */
+    @java.lang.Override
     public int getItemsCount() {
       return items_.size();
     }
     /**
      * repeated .Item items = 6;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.artery.protobuf.TestMessages.Item getItems(int index) {
       return items_.get(index);
     }
     /**
      * repeated .Item items = 6;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.artery.protobuf.TestMessages.ItemOrBuilder getItemsOrBuilder(
         int index) {
       return items_.get(index);
@@ -470,7 +409,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < items_.size(); i++) {
         output.writeMessage(6, items_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -501,7 +440,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(6, items_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -543,7 +482,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getItemsList()
           .equals(other.getItemsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -580,7 +519,7 @@ public int hashCode() {
         hash = (37 * hash) + ITEMS_FIELD_NUMBER;
         hash = (53 * hash) + getItemsList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -629,11 +568,13 @@ public static org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage p
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -697,39 +638,30 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getItemsFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         id_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         name_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         status_ = false;
-        bitField0_ = (bitField0_ & ~0x00000004);
         description_ = "";
-        bitField0_ = (bitField0_ & ~0x00000008);
         payload_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000010);
         if (itemsBuilder_ == null) {
           items_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000020);
         } else {
+          items_ = null;
           itemsBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000020);
         return this;
       }
 
@@ -756,6 +688,25 @@ public org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage build()
       @java.lang.Override
       public org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage buildPartial() {
         org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage result = new org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage(this);
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage result) {
+        if (itemsBuilder_ == null) {
+          if (((bitField0_ & 0x00000020) != 0)) {
+            items_ = java.util.Collections.unmodifiableList(items_);
+            bitField0_ = (bitField0_ & ~0x00000020);
+          }
+          result.items_ = items_;
+        } else {
+          result.items_ = itemsBuilder_.build();
+        }
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -763,33 +714,22 @@ public org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage buildPar
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.name_ = name_;
           to_bitField0_ |= 0x00000002;
         }
-        result.name_ = name_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.status_ = status_;
           to_bitField0_ |= 0x00000004;
         }
         if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.description_ = description_;
           to_bitField0_ |= 0x00000008;
         }
-        result.description_ = description_;
         if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.payload_ = payload_;
           to_bitField0_ |= 0x00000010;
         }
-        result.payload_ = payload_;
-        if (itemsBuilder_ == null) {
-          if (((bitField0_ & 0x00000020) != 0)) {
-            items_ = java.util.Collections.unmodifiableList(items_);
-            bitField0_ = (bitField0_ & ~0x00000020);
-          }
-          result.items_ = items_;
-        } else {
-          result.items_ = itemsBuilder_.build();
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -840,16 +780,16 @@ public Builder mergeFrom(org.apache.pekko.remote.artery.protobuf.TestMessages.Te
           setId(other.getId());
         }
         if (other.hasName()) {
-          bitField0_ |= 0x00000002;
           name_ = other.name_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasStatus()) {
           setStatus(other.getStatus());
         }
         if (other.hasDescription()) {
-          bitField0_ |= 0x00000008;
           description_ = other.description_;
+          bitField0_ |= 0x00000008;
           onChanged();
         }
         if (other.hasPayload()) {
@@ -881,7 +821,7 @@ public Builder mergeFrom(org.apache.pekko.remote.artery.protobuf.TestMessages.Te
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -910,17 +850,68 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                id_ = input.readUInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 18: {
+                name_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 24: {
+                status_ = input.readBool();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 34: {
+                description_ = input.readBytes();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 34
+              case 42: {
+                payload_ = input.readBytes();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 42
+              case 50: {
+                org.apache.pekko.remote.artery.protobuf.TestMessages.Item m =
+                    input.readMessage(
+                        org.apache.pekko.remote.artery.protobuf.TestMessages.Item.PARSER,
+                        extensionRegistry);
+                if (itemsBuilder_ == null) {
+                  ensureItemsIsMutable();
+                  items_.add(m);
+                } else {
+                  itemsBuilder_.addMessage(m);
+                }
+                break;
+              } // case 50
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -930,6 +921,7 @@ public Builder mergeFrom(
        * required uint64 id = 1;
        * @return Whether the id field is set.
        */
+      @java.lang.Override
       public boolean hasId() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -937,6 +929,7 @@ public boolean hasId() {
        * required uint64 id = 1;
        * @return The id.
        */
+      @java.lang.Override
       public long getId() {
         return id_;
       }
@@ -946,8 +939,9 @@ public long getId() {
        * @return This builder for chaining.
        */
       public Builder setId(long value) {
-        bitField0_ |= 0x00000001;
+
         id_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1012,11 +1006,9 @@ public java.lang.String getName() {
        */
       public Builder setName(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         name_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1025,8 +1017,8 @@ public Builder setName(
        * @return This builder for chaining.
        */
       public Builder clearName() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         name_ = getDefaultInstance().getName();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1037,11 +1029,9 @@ public Builder clearName() {
        */
       public Builder setNameBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         name_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1051,6 +1041,7 @@ public Builder setNameBytes(
        * required bool status = 3;
        * @return Whether the status field is set.
        */
+      @java.lang.Override
       public boolean hasStatus() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -1058,6 +1049,7 @@ public boolean hasStatus() {
        * required bool status = 3;
        * @return The status.
        */
+      @java.lang.Override
       public boolean getStatus() {
         return status_;
       }
@@ -1067,8 +1059,9 @@ public boolean getStatus() {
        * @return This builder for chaining.
        */
       public Builder setStatus(boolean value) {
-        bitField0_ |= 0x00000004;
+
         status_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1133,11 +1126,9 @@ public java.lang.String getDescription() {
        */
       public Builder setDescription(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
+        if (value == null) { throw new NullPointerException(); }
         description_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -1146,8 +1137,8 @@ public Builder setDescription(
        * @return This builder for chaining.
        */
       public Builder clearDescription() {
-        bitField0_ = (bitField0_ & ~0x00000008);
         description_ = getDefaultInstance().getDescription();
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
@@ -1158,11 +1149,9 @@ public Builder clearDescription() {
        */
       public Builder setDescriptionBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
+        if (value == null) { throw new NullPointerException(); }
         description_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -1172,6 +1161,7 @@ public Builder setDescriptionBytes(
        * optional bytes payload = 5;
        * @return Whether the payload field is set.
        */
+      @java.lang.Override
       public boolean hasPayload() {
         return ((bitField0_ & 0x00000010) != 0);
       }
@@ -1179,6 +1169,7 @@ public boolean hasPayload() {
        * optional bytes payload = 5;
        * @return The payload.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getPayload() {
         return payload_;
       }
@@ -1188,11 +1179,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getPayload() {
        * @return This builder for chaining.
        */
       public Builder setPayload(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000010;
+        if (value == null) { throw new NullPointerException(); }
         payload_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1479,7 +1468,18 @@ public TestMessage parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new TestMessage(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -1534,7 +1534,7 @@ public interface ItemOrBuilder extends
   /**
    * Protobuf type {@code Item}
    */
-  public  static final class Item extends
+  public static final class Item extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Item)
       ItemOrBuilder {
@@ -1554,60 +1554,6 @@ protected java.lang.Object newInstance(
       return new Item();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Item(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              id_ = input.readUInt64();
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              name_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.artery.protobuf.TestMessages.internal_static_Item_descriptor;
@@ -1623,11 +1569,12 @@ private Item(
 
     private int bitField0_;
     public static final int ID_FIELD_NUMBER = 1;
-    private long id_;
+    private long id_ = 0L;
     /**
      * required uint64 id = 1;
      * @return Whether the id field is set.
      */
+    @java.lang.Override
     public boolean hasId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -1635,16 +1582,19 @@ public boolean hasId() {
      * required uint64 id = 1;
      * @return The id.
      */
+    @java.lang.Override
     public long getId() {
       return id_;
     }
 
     public static final int NAME_FIELD_NUMBER = 2;
-    private volatile java.lang.Object name_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object name_ = "";
     /**
      * required string name = 2;
      * @return Whether the name field is set.
      */
+    @java.lang.Override
     public boolean hasName() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -1652,6 +1602,7 @@ public boolean hasName() {
      * required string name = 2;
      * @return The name.
      */
+    @java.lang.Override
     public java.lang.String getName() {
       java.lang.Object ref = name_;
       if (ref instanceof java.lang.String) {
@@ -1670,6 +1621,7 @@ public java.lang.String getName() {
      * required string name = 2;
      * @return The bytes for name.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getNameBytes() {
       java.lang.Object ref = name_;
@@ -1712,7 +1664,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, name_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -1728,7 +1680,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000002) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, name_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1753,7 +1705,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getName()
             .equals(other.getName())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1773,7 +1725,7 @@ public int hashCode() {
         hash = (37 * hash) + NAME_FIELD_NUMBER;
         hash = (53 * hash) + getName().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1822,11 +1774,13 @@ public static org.apache.pekko.remote.artery.protobuf.TestMessages.Item parseFro
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.artery.protobuf.TestMessages.Item parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.artery.protobuf.TestMessages.Item parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -1890,26 +1844,20 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.artery.protobuf.TestMessages.Item.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         id_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         name_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -1936,6 +1884,12 @@ public org.apache.pekko.remote.artery.protobuf.TestMessages.Item build() {
       @java.lang.Override
       public org.apache.pekko.remote.artery.protobuf.TestMessages.Item buildPartial() {
         org.apache.pekko.remote.artery.protobuf.TestMessages.Item result = new org.apache.pekko.remote.artery.protobuf.TestMessages.Item(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.artery.protobuf.TestMessages.Item result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -1943,12 +1897,10 @@ public org.apache.pekko.remote.artery.protobuf.TestMessages.Item buildPartial()
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.name_ = name_;
           to_bitField0_ |= 0x00000002;
         }
-        result.name_ = name_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1999,11 +1951,11 @@ public Builder mergeFrom(org.apache.pekko.remote.artery.protobuf.TestMessages.It
           setId(other.getId());
         }
         if (other.hasName()) {
-          bitField0_ |= 0x00000002;
           name_ = other.name_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -2024,17 +1976,40 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.artery.protobuf.TestMessages.Item parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                id_ = input.readUInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 18: {
+                name_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.artery.protobuf.TestMessages.Item) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -2044,6 +2019,7 @@ public Builder mergeFrom(
        * required uint64 id = 1;
        * @return Whether the id field is set.
        */
+      @java.lang.Override
       public boolean hasId() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -2051,6 +2027,7 @@ public boolean hasId() {
        * required uint64 id = 1;
        * @return The id.
        */
+      @java.lang.Override
       public long getId() {
         return id_;
       }
@@ -2060,8 +2037,9 @@ public long getId() {
        * @return This builder for chaining.
        */
       public Builder setId(long value) {
-        bitField0_ |= 0x00000001;
+
         id_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2126,11 +2104,9 @@ public java.lang.String getName() {
        */
       public Builder setName(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         name_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2139,8 +2115,8 @@ public Builder setName(
        * @return This builder for chaining.
        */
       public Builder clearName() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         name_ = getDefaultInstance().getName();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -2151,11 +2127,9 @@ public Builder clearName() {
        */
       public Builder setNameBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         name_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2192,7 +2166,18 @@ public Item parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Item(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
diff --git a/remote/src/main/java/org/apache/pekko/remote/ArteryControlFormats.java b/remote/src/main/java/org/apache/pekko/remote/ArteryControlFormats.java
index c5cf08dba31..ea4fd0328ba 100644
--- a/remote/src/main/java/org/apache/pekko/remote/ArteryControlFormats.java
+++ b/remote/src/main/java/org/apache/pekko/remote/ArteryControlFormats.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2021-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ArteryControlFormats.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.remote;
 
 public final class ArteryControlFormats {
@@ -64,7 +65,7 @@ public interface QuarantinedOrBuilder extends
   /**
    * Protobuf type {@code Quarantined}
    */
-  public  static final class Quarantined extends
+  public static final class Quarantined extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Quarantined)
       QuarantinedOrBuilder {
@@ -83,75 +84,6 @@ protected java.lang.Object newInstance(
       return new Quarantined();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Quarantined(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = from_.toBuilder();
-              }
-              from_ = input.readMessage(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(from_);
-                from_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = to_.toBuilder();
-              }
-              to_ = input.readMessage(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(to_);
-                to_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ArteryControlFormats.internal_static_Quarantined_descriptor;
@@ -172,6 +104,7 @@ private Quarantined(
      * required .UniqueAddress from = 1;
      * @return Whether the from field is set.
      */
+    @java.lang.Override
     public boolean hasFrom() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -179,12 +112,14 @@ public boolean hasFrom() {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getFrom() {
       return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
     }
     /**
      * required .UniqueAddress from = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
       return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
     }
@@ -195,6 +130,7 @@ public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFr
      * required .UniqueAddress to = 2;
      * @return Whether the to field is set.
      */
+    @java.lang.Override
     public boolean hasTo() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -202,12 +138,14 @@ public boolean hasTo() {
      * required .UniqueAddress to = 2;
      * @return The to.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getTo() {
       return to_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : to_;
     }
     /**
      * required .UniqueAddress to = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getToOrBuilder() {
       return to_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : to_;
     }
@@ -248,7 +186,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getTo());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -265,7 +203,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getTo());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -290,7 +228,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getTo()
             .equals(other.getTo())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -309,7 +247,7 @@ public int hashCode() {
         hash = (37 * hash) + TO_FIELD_NUMBER;
         hash = (53 * hash) + getTo().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -358,11 +296,13 @@ public static org.apache.pekko.remote.ArteryControlFormats.Quarantined parseFrom
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.Quarantined parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.Quarantined parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -444,18 +384,17 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (fromBuilder_ == null) {
-          from_ = null;
-        } else {
-          fromBuilder_.clear();
+        bitField0_ = 0;
+        from_ = null;
+        if (fromBuilder_ != null) {
+          fromBuilder_.dispose();
+          fromBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (toBuilder_ == null) {
-          to_ = null;
-        } else {
-          toBuilder_.clear();
+        to_ = null;
+        if (toBuilder_ != null) {
+          toBuilder_.dispose();
+          toBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -482,27 +421,27 @@ public org.apache.pekko.remote.ArteryControlFormats.Quarantined build() {
       @java.lang.Override
       public org.apache.pekko.remote.ArteryControlFormats.Quarantined buildPartial() {
         org.apache.pekko.remote.ArteryControlFormats.Quarantined result = new org.apache.pekko.remote.ArteryControlFormats.Quarantined(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ArteryControlFormats.Quarantined result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (fromBuilder_ == null) {
-            result.from_ = from_;
-          } else {
-            result.from_ = fromBuilder_.build();
-          }
+          result.from_ = fromBuilder_ == null
+              ? from_
+              : fromBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (toBuilder_ == null) {
-            result.to_ = to_;
-          } else {
-            result.to_ = toBuilder_.build();
-          }
+          result.to_ = toBuilder_ == null
+              ? to_
+              : toBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -555,7 +494,7 @@ public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.Quarantine
         if (other.hasTo()) {
           mergeTo(other.getTo());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -582,17 +521,44 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ArteryControlFormats.Quarantined parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getFromFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getToFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.Quarantined) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -627,11 +593,11 @@ public Builder setFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddres
             throw new NullPointerException();
           }
           from_ = value;
-          onChanged();
         } else {
           fromBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -641,11 +607,11 @@ public Builder setFrom(
           org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
-          onChanged();
         } else {
           fromBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -654,31 +620,32 @@ public Builder setFrom(
       public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              from_ != null &&
-              from_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
-            from_ =
-              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
+            from_ != null &&
+            from_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
+            getFromBuilder().mergeFrom(value);
           } else {
             from_ = value;
           }
-          onChanged();
         } else {
           fromBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (from_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .UniqueAddress from = 1;
        */
       public Builder clearFrom() {
-        if (fromBuilder_ == null) {
-          from_ = null;
-          onChanged();
-        } else {
-          fromBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        from_ = null;
+        if (fromBuilder_ != null) {
+          fromBuilder_.dispose();
+          fromBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -747,11 +714,11 @@ public Builder setTo(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress
             throw new NullPointerException();
           }
           to_ = value;
-          onChanged();
         } else {
           toBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -761,11 +728,11 @@ public Builder setTo(
           org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
         if (toBuilder_ == null) {
           to_ = builderForValue.build();
-          onChanged();
         } else {
           toBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -774,31 +741,32 @@ public Builder setTo(
       public Builder mergeTo(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (toBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              to_ != null &&
-              to_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
-            to_ =
-              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.newBuilder(to_).mergeFrom(value).buildPartial();
+            to_ != null &&
+            to_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
+            getToBuilder().mergeFrom(value);
           } else {
             to_ = value;
           }
-          onChanged();
         } else {
           toBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (to_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .UniqueAddress to = 2;
        */
       public Builder clearTo() {
-        if (toBuilder_ == null) {
-          to_ = null;
-          onChanged();
-        } else {
-          toBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        to_ = null;
+        if (toBuilder_ != null) {
+          toBuilder_.dispose();
+          toBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -869,7 +837,18 @@ public Quarantined parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Quarantined(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -919,7 +898,7 @@ public interface MessageWithAddressOrBuilder extends
    *
    * Protobuf type {@code MessageWithAddress}
    */
-  public  static final class MessageWithAddress extends
+  public static final class MessageWithAddress extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:MessageWithAddress)
       MessageWithAddressOrBuilder {
@@ -938,62 +917,6 @@ protected java.lang.Object newInstance(
       return new MessageWithAddress();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private MessageWithAddress(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = address_.toBuilder();
-              }
-              address_ = input.readMessage(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(address_);
-                address_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ArteryControlFormats.internal_static_MessageWithAddress_descriptor;
@@ -1014,6 +937,7 @@ private MessageWithAddress(
      * required .UniqueAddress address = 1;
      * @return Whether the address field is set.
      */
+    @java.lang.Override
     public boolean hasAddress() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -1021,12 +945,14 @@ public boolean hasAddress() {
      * required .UniqueAddress address = 1;
      * @return The address.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getAddress() {
       return address_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : address_;
     }
     /**
      * required .UniqueAddress address = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getAddressOrBuilder() {
       return address_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : address_;
     }
@@ -1056,7 +982,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getAddress());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -1069,7 +995,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getAddress());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1089,7 +1015,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getAddress()
             .equals(other.getAddress())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1104,7 +1030,7 @@ public int hashCode() {
         hash = (37 * hash) + ADDRESS_FIELD_NUMBER;
         hash = (53 * hash) + getAddress().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1153,11 +1079,13 @@ public static org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress pa
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -1246,12 +1174,12 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (addressBuilder_ == null) {
-          address_ = null;
-        } else {
-          addressBuilder_.clear();
+        bitField0_ = 0;
+        address_ = null;
+        if (addressBuilder_ != null) {
+          addressBuilder_.dispose();
+          addressBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -1278,19 +1206,21 @@ public org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress build() {
       @java.lang.Override
       public org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress buildPartial() {
         org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress result = new org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (addressBuilder_ == null) {
-            result.address_ = address_;
-          } else {
-            result.address_ = addressBuilder_.build();
-          }
+          result.address_ = addressBuilder_ == null
+              ? address_
+              : addressBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1340,7 +1270,7 @@ public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.MessageWit
         if (other.hasAddress()) {
           mergeAddress(other.getAddress());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1361,17 +1291,37 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getAddressFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -1406,11 +1356,11 @@ public Builder setAddress(org.apache.pekko.remote.ArteryControlFormats.UniqueAdd
             throw new NullPointerException();
           }
           address_ = value;
-          onChanged();
         } else {
           addressBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1420,11 +1370,11 @@ public Builder setAddress(
           org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
         if (addressBuilder_ == null) {
           address_ = builderForValue.build();
-          onChanged();
         } else {
           addressBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1433,31 +1383,32 @@ public Builder setAddress(
       public Builder mergeAddress(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (addressBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              address_ != null &&
-              address_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
-            address_ =
-              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.newBuilder(address_).mergeFrom(value).buildPartial();
+            address_ != null &&
+            address_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
+            getAddressBuilder().mergeFrom(value);
           } else {
             address_ = value;
           }
-          onChanged();
         } else {
           addressBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (address_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .UniqueAddress address = 1;
        */
       public Builder clearAddress() {
-        if (addressBuilder_ == null) {
-          address_ = null;
-          onChanged();
-        } else {
-          addressBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        address_ = null;
+        if (addressBuilder_ != null) {
+          addressBuilder_.dispose();
+          addressBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -1528,7 +1479,18 @@ public MessageWithAddress parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new MessageWithAddress(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -1585,7 +1547,7 @@ public interface HandshakeReqOrBuilder extends
   /**
    * Protobuf type {@code HandshakeReq}
    */
-  public  static final class HandshakeReq extends
+  public static final class HandshakeReq extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:HandshakeReq)
       HandshakeReqOrBuilder {
@@ -1604,75 +1566,6 @@ protected java.lang.Object newInstance(
       return new HandshakeReq();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private HandshakeReq(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = from_.toBuilder();
-              }
-              from_ = input.readMessage(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(from_);
-                from_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.remote.ArteryControlFormats.Address.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = to_.toBuilder();
-              }
-              to_ = input.readMessage(org.apache.pekko.remote.ArteryControlFormats.Address.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(to_);
-                to_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ArteryControlFormats.internal_static_HandshakeReq_descriptor;
@@ -1693,6 +1586,7 @@ private HandshakeReq(
      * required .UniqueAddress from = 1;
      * @return Whether the from field is set.
      */
+    @java.lang.Override
     public boolean hasFrom() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -1700,12 +1594,14 @@ public boolean hasFrom() {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getFrom() {
       return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
     }
     /**
      * required .UniqueAddress from = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
       return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
     }
@@ -1716,6 +1612,7 @@ public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFr
      * required .Address to = 2;
      * @return Whether the to field is set.
      */
+    @java.lang.Override
     public boolean hasTo() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -1723,12 +1620,14 @@ public boolean hasTo() {
      * required .Address to = 2;
      * @return The to.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ArteryControlFormats.Address getTo() {
       return to_ == null ? org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance() : to_;
     }
     /**
      * required .Address to = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ArteryControlFormats.AddressOrBuilder getToOrBuilder() {
       return to_ == null ? org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance() : to_;
     }
@@ -1769,7 +1668,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getTo());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -1786,7 +1685,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getTo());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1811,7 +1710,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getTo()
             .equals(other.getTo())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1830,7 +1729,7 @@ public int hashCode() {
         hash = (37 * hash) + TO_FIELD_NUMBER;
         hash = (53 * hash) + getTo().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1879,11 +1778,13 @@ public static org.apache.pekko.remote.ArteryControlFormats.HandshakeReq parseFro
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.HandshakeReq parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.HandshakeReq parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -1965,18 +1866,17 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (fromBuilder_ == null) {
-          from_ = null;
-        } else {
-          fromBuilder_.clear();
+        bitField0_ = 0;
+        from_ = null;
+        if (fromBuilder_ != null) {
+          fromBuilder_.dispose();
+          fromBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (toBuilder_ == null) {
-          to_ = null;
-        } else {
-          toBuilder_.clear();
+        to_ = null;
+        if (toBuilder_ != null) {
+          toBuilder_.dispose();
+          toBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -2003,27 +1903,27 @@ public org.apache.pekko.remote.ArteryControlFormats.HandshakeReq build() {
       @java.lang.Override
       public org.apache.pekko.remote.ArteryControlFormats.HandshakeReq buildPartial() {
         org.apache.pekko.remote.ArteryControlFormats.HandshakeReq result = new org.apache.pekko.remote.ArteryControlFormats.HandshakeReq(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ArteryControlFormats.HandshakeReq result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (fromBuilder_ == null) {
-            result.from_ = from_;
-          } else {
-            result.from_ = fromBuilder_.build();
-          }
+          result.from_ = fromBuilder_ == null
+              ? from_
+              : fromBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (toBuilder_ == null) {
-            result.to_ = to_;
-          } else {
-            result.to_ = toBuilder_.build();
-          }
+          result.to_ = toBuilder_ == null
+              ? to_
+              : toBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -2076,7 +1976,7 @@ public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.HandshakeR
         if (other.hasTo()) {
           mergeTo(other.getTo());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -2103,17 +2003,44 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ArteryControlFormats.HandshakeReq parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getFromFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getToFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.HandshakeReq) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -2148,11 +2075,11 @@ public Builder setFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddres
             throw new NullPointerException();
           }
           from_ = value;
-          onChanged();
         } else {
           fromBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -2162,11 +2089,11 @@ public Builder setFrom(
           org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
-          onChanged();
         } else {
           fromBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -2175,31 +2102,32 @@ public Builder setFrom(
       public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              from_ != null &&
-              from_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
-            from_ =
-              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
+            from_ != null &&
+            from_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
+            getFromBuilder().mergeFrom(value);
           } else {
             from_ = value;
           }
-          onChanged();
         } else {
           fromBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (from_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .UniqueAddress from = 1;
        */
       public Builder clearFrom() {
-        if (fromBuilder_ == null) {
-          from_ = null;
-          onChanged();
-        } else {
-          fromBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        from_ = null;
+        if (fromBuilder_ != null) {
+          fromBuilder_.dispose();
+          fromBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -2268,11 +2196,11 @@ public Builder setTo(org.apache.pekko.remote.ArteryControlFormats.Address value)
             throw new NullPointerException();
           }
           to_ = value;
-          onChanged();
         } else {
           toBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -2282,11 +2210,11 @@ public Builder setTo(
           org.apache.pekko.remote.ArteryControlFormats.Address.Builder builderForValue) {
         if (toBuilder_ == null) {
           to_ = builderForValue.build();
-          onChanged();
         } else {
           toBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -2295,31 +2223,32 @@ public Builder setTo(
       public Builder mergeTo(org.apache.pekko.remote.ArteryControlFormats.Address value) {
         if (toBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              to_ != null &&
-              to_ != org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance()) {
-            to_ =
-              org.apache.pekko.remote.ArteryControlFormats.Address.newBuilder(to_).mergeFrom(value).buildPartial();
+            to_ != null &&
+            to_ != org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance()) {
+            getToBuilder().mergeFrom(value);
           } else {
             to_ = value;
           }
-          onChanged();
         } else {
           toBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (to_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Address to = 2;
        */
       public Builder clearTo() {
-        if (toBuilder_ == null) {
-          to_ = null;
-          onChanged();
-        } else {
-          toBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        to_ = null;
+        if (toBuilder_ != null) {
+          toBuilder_.dispose();
+          toBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -2390,7 +2319,18 @@ public HandshakeReq parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new HandshakeReq(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -2525,7 +2465,7 @@ public interface CompressionTableAdvertisementOrBuilder extends
    *
    * Protobuf type {@code CompressionTableAdvertisement}
    */
-  public  static final class CompressionTableAdvertisement extends
+  public static final class CompressionTableAdvertisement extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:CompressionTableAdvertisement)
       CompressionTableAdvertisementOrBuilder {
@@ -2535,7 +2475,8 @@ private CompressionTableAdvertisement(org.apache.pekko.protobufv3.internal.Gener
       super(builder);
     }
     private CompressionTableAdvertisement() {
-      keys_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      keys_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       values_ = emptyIntList();
     }
 
@@ -2546,108 +2487,6 @@ protected java.lang.Object newInstance(
       return new CompressionTableAdvertisement();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private CompressionTableAdvertisement(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = from_.toBuilder();
-              }
-              from_ = input.readMessage(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(from_);
-                from_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              originUid_ = input.readUInt64();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              tableVersion_ = input.readUInt32();
-              break;
-            }
-            case 34: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                keys_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              keys_.add(bs);
-              break;
-            }
-            case 40: {
-              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
-                values_ = newIntList();
-                mutable_bitField0_ |= 0x00000010;
-              }
-              values_.addInt(input.readUInt32());
-              break;
-            }
-            case 42: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000010) != 0) && input.getBytesUntilLimit() > 0) {
-                values_ = newIntList();
-                mutable_bitField0_ |= 0x00000010;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                values_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000008) != 0)) {
-          keys_ = keys_.getUnmodifiableView();
-        }
-        if (((mutable_bitField0_ & 0x00000010) != 0)) {
-          values_.makeImmutable(); // C
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisement_descriptor;
@@ -2668,6 +2507,7 @@ private CompressionTableAdvertisement(
      * required .UniqueAddress from = 1;
      * @return Whether the from field is set.
      */
+    @java.lang.Override
     public boolean hasFrom() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -2675,22 +2515,25 @@ public boolean hasFrom() {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getFrom() {
       return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
     }
     /**
      * required .UniqueAddress from = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
       return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
     }
 
     public static final int ORIGINUID_FIELD_NUMBER = 2;
-    private long originUid_;
+    private long originUid_ = 0L;
     /**
      * required uint64 originUid = 2;
      * @return Whether the originUid field is set.
      */
+    @java.lang.Override
     public boolean hasOriginUid() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -2698,16 +2541,18 @@ public boolean hasOriginUid() {
      * required uint64 originUid = 2;
      * @return The originUid.
      */
+    @java.lang.Override
     public long getOriginUid() {
       return originUid_;
     }
 
     public static final int TABLEVERSION_FIELD_NUMBER = 3;
-    private int tableVersion_;
+    private int tableVersion_ = 0;
     /**
      * required uint32 tableVersion = 3;
      * @return Whether the tableVersion field is set.
      */
+    @java.lang.Override
     public boolean hasTableVersion() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -2715,12 +2560,15 @@ public boolean hasTableVersion() {
      * required uint32 tableVersion = 3;
      * @return The tableVersion.
      */
+    @java.lang.Override
     public int getTableVersion() {
       return tableVersion_;
     }
 
     public static final int KEYS_FIELD_NUMBER = 4;
-    private org.apache.pekko.protobufv3.internal.LazyStringList keys_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList keys_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * 
      * actual Map is represented by separate sequences of keys and values,
@@ -2779,11 +2627,14 @@ public java.lang.String getKeys(int index) {
     }
 
     public static final int VALUES_FIELD_NUMBER = 5;
-    private org.apache.pekko.protobufv3.internal.Internal.IntList values_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.Internal.IntList values_ =
+        emptyIntList();
     /**
      * repeated uint32 values = 5;
      * @return A list containing the values.
      */
+    @java.lang.Override
     public java.util.List
         getValuesList() {
       return values_;
@@ -2849,7 +2700,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < values_.size(); i++) {
         output.writeUInt32(5, values_.getInt(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -2887,7 +2738,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getValuesList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2921,7 +2772,7 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getKeysList())) return false;
       if (!getValuesList()
           .equals(other.getValuesList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -2953,7 +2804,7 @@ public int hashCode() {
         hash = (37 * hash) + VALUES_FIELD_NUMBER;
         hash = (53 * hash) + getValuesList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3002,11 +2853,13 @@ public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdver
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -3092,20 +2945,17 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (fromBuilder_ == null) {
-          from_ = null;
-        } else {
-          fromBuilder_.clear();
+        bitField0_ = 0;
+        from_ = null;
+        if (fromBuilder_ != null) {
+          fromBuilder_.dispose();
+          fromBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         originUid_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
         tableVersion_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000004);
-        keys_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        keys_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         values_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
@@ -3132,14 +2982,18 @@ public org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisemen
       @java.lang.Override
       public org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement buildPartial() {
         org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement result = new org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (fromBuilder_ == null) {
-            result.from_ = from_;
-          } else {
-            result.from_ = fromBuilder_.build();
-          }
+          result.from_ = fromBuilder_ == null
+              ? from_
+              : fromBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
@@ -3150,19 +3004,15 @@ public org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisemen
           result.tableVersion_ = tableVersion_;
           to_bitField0_ |= 0x00000004;
         }
-        if (((bitField0_ & 0x00000008) != 0)) {
-          keys_ = keys_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000008);
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          keys_.makeImmutable();
+          result.keys_ = keys_;
         }
-        result.keys_ = keys_;
-        if (((bitField0_ & 0x00000010) != 0)) {
+        if (((from_bitField0_ & 0x00000010) != 0)) {
           values_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000010);
+          result.values_ = values_;
         }
-        result.values_ = values_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -3221,7 +3071,7 @@ public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.Compressio
         if (!other.keys_.isEmpty()) {
           if (keys_.isEmpty()) {
             keys_ = other.keys_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ |= 0x00000008;
           } else {
             ensureKeysIsMutable();
             keys_.addAll(other.keys_);
@@ -3231,14 +3081,15 @@ public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.Compressio
         if (!other.values_.isEmpty()) {
           if (values_.isEmpty()) {
             values_ = other.values_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            values_.makeImmutable();
+            bitField0_ |= 0x00000010;
           } else {
             ensureValuesIsMutable();
             values_.addAll(other.values_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -3265,17 +3116,69 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getFromFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                originUid_ = input.readUInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                tableVersion_ = input.readUInt32();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 34: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureKeysIsMutable();
+                keys_.add(bs);
+                break;
+              } // case 34
+              case 40: {
+                int v = input.readUInt32();
+                ensureValuesIsMutable();
+                values_.addInt(v);
+                break;
+              } // case 40
+              case 42: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureValuesIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  values_.addInt(input.readUInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 42
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -3310,11 +3213,11 @@ public Builder setFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddres
             throw new NullPointerException();
           }
           from_ = value;
-          onChanged();
         } else {
           fromBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -3324,11 +3227,11 @@ public Builder setFrom(
           org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
-          onChanged();
         } else {
           fromBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -3337,31 +3240,32 @@ public Builder setFrom(
       public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              from_ != null &&
-              from_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
-            from_ =
-              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
+            from_ != null &&
+            from_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
+            getFromBuilder().mergeFrom(value);
           } else {
             from_ = value;
           }
-          onChanged();
         } else {
           fromBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (from_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .UniqueAddress from = 1;
        */
       public Builder clearFrom() {
-        if (fromBuilder_ == null) {
-          from_ = null;
-          onChanged();
-        } else {
-          fromBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        from_ = null;
+        if (fromBuilder_ != null) {
+          fromBuilder_.dispose();
+          fromBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -3405,6 +3309,7 @@ public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFr
        * required uint64 originUid = 2;
        * @return Whether the originUid field is set.
        */
+      @java.lang.Override
       public boolean hasOriginUid() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -3412,6 +3317,7 @@ public boolean hasOriginUid() {
        * required uint64 originUid = 2;
        * @return The originUid.
        */
+      @java.lang.Override
       public long getOriginUid() {
         return originUid_;
       }
@@ -3421,8 +3327,9 @@ public long getOriginUid() {
        * @return This builder for chaining.
        */
       public Builder setOriginUid(long value) {
-        bitField0_ |= 0x00000002;
+
         originUid_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -3442,6 +3349,7 @@ public Builder clearOriginUid() {
        * required uint32 tableVersion = 3;
        * @return Whether the tableVersion field is set.
        */
+      @java.lang.Override
       public boolean hasTableVersion() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -3449,6 +3357,7 @@ public boolean hasTableVersion() {
        * required uint32 tableVersion = 3;
        * @return The tableVersion.
        */
+      @java.lang.Override
       public int getTableVersion() {
         return tableVersion_;
       }
@@ -3458,8 +3367,9 @@ public int getTableVersion() {
        * @return This builder for chaining.
        */
       public Builder setTableVersion(int value) {
-        bitField0_ |= 0x00000004;
+
         tableVersion_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -3474,12 +3384,13 @@ public Builder clearTableVersion() {
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList keys_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList keys_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureKeysIsMutable() {
-        if (!((bitField0_ & 0x00000008) != 0)) {
+        if (!keys_.isModifiable()) {
           keys_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(keys_);
-          bitField0_ |= 0x00000008;
-         }
+        }
+        bitField0_ |= 0x00000008;
       }
       /**
        * 
@@ -3493,7 +3404,8 @@ private void ensureKeysIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getKeysList() {
-        return keys_.getUnmodifiableView();
+        keys_.makeImmutable();
+        return keys_;
       }
       /**
        * 
@@ -3551,11 +3463,10 @@ public java.lang.String getKeys(int index) {
        */
       public Builder setKeys(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureKeysIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureKeysIsMutable();
         keys_.set(index, value);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -3572,11 +3483,10 @@ public Builder setKeys(
        */
       public Builder addKeys(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureKeysIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureKeysIsMutable();
         keys_.add(value);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -3596,6 +3506,7 @@ public Builder addAllKeys(
         ensureKeysIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, keys_);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -3610,8 +3521,9 @@ public Builder addAllKeys(
        * @return This builder for chaining.
        */
       public Builder clearKeys() {
-        keys_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        keys_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000008);;
         onChanged();
         return this;
       }
@@ -3628,21 +3540,20 @@ public Builder clearKeys() {
        */
       public Builder addKeysBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureKeysIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureKeysIsMutable();
         keys_.add(value);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
 
       private org.apache.pekko.protobufv3.internal.Internal.IntList values_ = emptyIntList();
       private void ensureValuesIsMutable() {
-        if (!((bitField0_ & 0x00000010) != 0)) {
-          values_ = mutableCopy(values_);
-          bitField0_ |= 0x00000010;
-         }
+        if (!values_.isModifiable()) {
+          values_ = makeMutableCopy(values_);
+        }
+        bitField0_ |= 0x00000010;
       }
       /**
        * repeated uint32 values = 5;
@@ -3650,8 +3561,8 @@ private void ensureValuesIsMutable() {
        */
       public java.util.List
           getValuesList() {
-        return ((bitField0_ & 0x00000010) != 0) ?
-                 java.util.Collections.unmodifiableList(values_) : values_;
+        values_.makeImmutable();
+        return values_;
       }
       /**
        * repeated uint32 values = 5;
@@ -3676,8 +3587,10 @@ public int getValues(int index) {
        */
       public Builder setValues(
           int index, int value) {
+
         ensureValuesIsMutable();
         values_.setInt(index, value);
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -3687,8 +3600,10 @@ public Builder setValues(
        * @return This builder for chaining.
        */
       public Builder addValues(int value) {
+
         ensureValuesIsMutable();
         values_.addInt(value);
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -3702,6 +3617,7 @@ public Builder addAllValues(
         ensureValuesIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, values_);
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -3748,7 +3664,18 @@ public CompressionTableAdvertisement parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new CompressionTableAdvertisement(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -3806,7 +3733,7 @@ public interface CompressionTableAdvertisementAckOrBuilder extends
    *
    * Protobuf type {@code CompressionTableAdvertisementAck}
    */
-  public  static final class CompressionTableAdvertisementAck extends
+  public static final class CompressionTableAdvertisementAck extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:CompressionTableAdvertisementAck)
       CompressionTableAdvertisementAckOrBuilder {
@@ -3825,67 +3752,6 @@ protected java.lang.Object newInstance(
       return new CompressionTableAdvertisementAck();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private CompressionTableAdvertisementAck(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = from_.toBuilder();
-              }
-              from_ = input.readMessage(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(from_);
-                from_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              version_ = input.readUInt32();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisementAck_descriptor;
@@ -3906,6 +3772,7 @@ private CompressionTableAdvertisementAck(
      * required .UniqueAddress from = 1;
      * @return Whether the from field is set.
      */
+    @java.lang.Override
     public boolean hasFrom() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -3913,22 +3780,25 @@ public boolean hasFrom() {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getFrom() {
       return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
     }
     /**
      * required .UniqueAddress from = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
       return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
     }
 
     public static final int VERSION_FIELD_NUMBER = 2;
-    private int version_;
+    private int version_ = 0;
     /**
      * required uint32 version = 2;
      * @return Whether the version field is set.
      */
+    @java.lang.Override
     public boolean hasVersion() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -3936,6 +3806,7 @@ public boolean hasVersion() {
      * required uint32 version = 2;
      * @return The version.
      */
+    @java.lang.Override
     public int getVersion() {
       return version_;
     }
@@ -3972,7 +3843,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeUInt32(2, version_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -3989,7 +3860,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(2, version_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4014,7 +3885,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getVersion()
             != other.getVersion()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -4033,7 +3904,7 @@ public int hashCode() {
         hash = (37 * hash) + VERSION_FIELD_NUMBER;
         hash = (53 * hash) + getVersion();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4082,11 +3953,13 @@ public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdver
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -4172,14 +4045,13 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (fromBuilder_ == null) {
-          from_ = null;
-        } else {
-          fromBuilder_.clear();
+        bitField0_ = 0;
+        from_ = null;
+        if (fromBuilder_ != null) {
+          fromBuilder_.dispose();
+          fromBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         version_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -4206,23 +4078,25 @@ public org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisemen
       @java.lang.Override
       public org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck buildPartial() {
         org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck result = new org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (fromBuilder_ == null) {
-            result.from_ = from_;
-          } else {
-            result.from_ = fromBuilder_.build();
-          }
+          result.from_ = fromBuilder_ == null
+              ? from_
+              : fromBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.version_ = version_;
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -4275,7 +4149,7 @@ public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.Compressio
         if (other.hasVersion()) {
           setVersion(other.getVersion());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -4299,17 +4173,42 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getFromFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                version_ = input.readUInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -4344,11 +4243,11 @@ public Builder setFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddres
             throw new NullPointerException();
           }
           from_ = value;
-          onChanged();
         } else {
           fromBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -4358,11 +4257,11 @@ public Builder setFrom(
           org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
-          onChanged();
         } else {
           fromBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -4371,31 +4270,32 @@ public Builder setFrom(
       public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              from_ != null &&
-              from_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
-            from_ =
-              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
+            from_ != null &&
+            from_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
+            getFromBuilder().mergeFrom(value);
           } else {
             from_ = value;
           }
-          onChanged();
         } else {
           fromBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (from_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .UniqueAddress from = 1;
        */
       public Builder clearFrom() {
-        if (fromBuilder_ == null) {
-          from_ = null;
-          onChanged();
-        } else {
-          fromBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        from_ = null;
+        if (fromBuilder_ != null) {
+          fromBuilder_.dispose();
+          fromBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -4439,6 +4339,7 @@ public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFr
        * required uint32 version = 2;
        * @return Whether the version field is set.
        */
+      @java.lang.Override
       public boolean hasVersion() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -4446,6 +4347,7 @@ public boolean hasVersion() {
        * required uint32 version = 2;
        * @return The version.
        */
+      @java.lang.Override
       public int getVersion() {
         return version_;
       }
@@ -4455,8 +4357,9 @@ public int getVersion() {
        * @return This builder for chaining.
        */
       public Builder setVersion(int value) {
-        bitField0_ |= 0x00000002;
+
         version_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4503,7 +4406,18 @@ public CompressionTableAdvertisementAck parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new CompressionTableAdvertisementAck(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -4593,7 +4507,7 @@ public interface SystemMessageEnvelopeOrBuilder extends
    *
    * Protobuf type {@code SystemMessageEnvelope}
    */
-  public  static final class SystemMessageEnvelope extends
+  public static final class SystemMessageEnvelope extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:SystemMessageEnvelope)
       SystemMessageEnvelopeOrBuilder {
@@ -4614,82 +4528,6 @@ protected java.lang.Object newInstance(
       return new SystemMessageEnvelope();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private SystemMessageEnvelope(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              bitField0_ |= 0x00000001;
-              message_ = input.readBytes();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              serializerId_ = input.readInt32();
-              break;
-            }
-            case 26: {
-              bitField0_ |= 0x00000004;
-              messageManifest_ = input.readBytes();
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              seqNo_ = input.readUInt64();
-              break;
-            }
-            case 42: {
-              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000010) != 0)) {
-                subBuilder = ackReplyTo_.toBuilder();
-              }
-              ackReplyTo_ = input.readMessage(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(ackReplyTo_);
-                ackReplyTo_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000010;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ArteryControlFormats.internal_static_SystemMessageEnvelope_descriptor;
@@ -4705,11 +4543,12 @@ private SystemMessageEnvelope(
 
     private int bitField0_;
     public static final int MESSAGE_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.ByteString message_;
+    private org.apache.pekko.protobufv3.internal.ByteString message_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * required bytes message = 1;
      * @return Whether the message field is set.
      */
+    @java.lang.Override
     public boolean hasMessage() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -4717,16 +4556,18 @@ public boolean hasMessage() {
      * required bytes message = 1;
      * @return The message.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getMessage() {
       return message_;
     }
 
     public static final int SERIALIZERID_FIELD_NUMBER = 2;
-    private int serializerId_;
+    private int serializerId_ = 0;
     /**
      * required int32 serializerId = 2;
      * @return Whether the serializerId field is set.
      */
+    @java.lang.Override
     public boolean hasSerializerId() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -4734,16 +4575,18 @@ public boolean hasSerializerId() {
      * required int32 serializerId = 2;
      * @return The serializerId.
      */
+    @java.lang.Override
     public int getSerializerId() {
       return serializerId_;
     }
 
     public static final int MESSAGEMANIFEST_FIELD_NUMBER = 3;
-    private org.apache.pekko.protobufv3.internal.ByteString messageManifest_;
+    private org.apache.pekko.protobufv3.internal.ByteString messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * optional bytes messageManifest = 3;
      * @return Whether the messageManifest field is set.
      */
+    @java.lang.Override
     public boolean hasMessageManifest() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -4751,16 +4594,18 @@ public boolean hasMessageManifest() {
      * optional bytes messageManifest = 3;
      * @return The messageManifest.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
       return messageManifest_;
     }
 
     public static final int SEQNO_FIELD_NUMBER = 4;
-    private long seqNo_;
+    private long seqNo_ = 0L;
     /**
      * required uint64 seqNo = 4;
      * @return Whether the seqNo field is set.
      */
+    @java.lang.Override
     public boolean hasSeqNo() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -4768,6 +4613,7 @@ public boolean hasSeqNo() {
      * required uint64 seqNo = 4;
      * @return The seqNo.
      */
+    @java.lang.Override
     public long getSeqNo() {
       return seqNo_;
     }
@@ -4778,6 +4624,7 @@ public long getSeqNo() {
      * required .UniqueAddress ackReplyTo = 5;
      * @return Whether the ackReplyTo field is set.
      */
+    @java.lang.Override
     public boolean hasAckReplyTo() {
       return ((bitField0_ & 0x00000010) != 0);
     }
@@ -4785,12 +4632,14 @@ public boolean hasAckReplyTo() {
      * required .UniqueAddress ackReplyTo = 5;
      * @return The ackReplyTo.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getAckReplyTo() {
       return ackReplyTo_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : ackReplyTo_;
     }
     /**
      * required .UniqueAddress ackReplyTo = 5;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getAckReplyToOrBuilder() {
       return ackReplyTo_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : ackReplyTo_;
     }
@@ -4844,7 +4693,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000010) != 0)) {
         output.writeMessage(5, getAckReplyTo());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -4873,7 +4722,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(5, getAckReplyTo());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4913,7 +4762,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getAckReplyTo()
             .equals(other.getAckReplyTo())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -4945,7 +4794,7 @@ public int hashCode() {
         hash = (37 * hash) + ACKREPLYTO_FIELD_NUMBER;
         hash = (53 * hash) + getAckReplyTo().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4994,11 +4843,13 @@ public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -5083,20 +4934,16 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         message_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
         serializerId_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000004);
         seqNo_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000008);
-        if (ackReplyToBuilder_ == null) {
-          ackReplyTo_ = null;
-        } else {
-          ackReplyToBuilder_.clear();
+        ackReplyTo_ = null;
+        if (ackReplyToBuilder_ != null) {
+          ackReplyToBuilder_.dispose();
+          ackReplyToBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
@@ -5123,35 +4970,37 @@ public org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope build(
       @java.lang.Override
       public org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope buildPartial() {
         org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope result = new org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.message_ = message_;
           to_bitField0_ |= 0x00000001;
         }
-        result.message_ = message_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.serializerId_ = serializerId_;
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.messageManifest_ = messageManifest_;
           to_bitField0_ |= 0x00000004;
         }
-        result.messageManifest_ = messageManifest_;
         if (((from_bitField0_ & 0x00000008) != 0)) {
           result.seqNo_ = seqNo_;
           to_bitField0_ |= 0x00000008;
         }
         if (((from_bitField0_ & 0x00000010) != 0)) {
-          if (ackReplyToBuilder_ == null) {
-            result.ackReplyTo_ = ackReplyTo_;
-          } else {
-            result.ackReplyTo_ = ackReplyToBuilder_.build();
-          }
+          result.ackReplyTo_ = ackReplyToBuilder_ == null
+              ? ackReplyTo_
+              : ackReplyToBuilder_.build();
           to_bitField0_ |= 0x00000010;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -5213,7 +5062,7 @@ public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.SystemMess
         if (other.hasAckReplyTo()) {
           mergeAckReplyTo(other.getAckReplyTo());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -5243,17 +5092,57 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                message_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                serializerId_ = input.readInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 26: {
+                messageManifest_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              case 32: {
+                seqNo_ = input.readUInt64();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              case 42: {
+                input.readMessage(
+                    getAckReplyToFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 42
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -5263,6 +5152,7 @@ public Builder mergeFrom(
        * required bytes message = 1;
        * @return Whether the message field is set.
        */
+      @java.lang.Override
       public boolean hasMessage() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -5270,6 +5160,7 @@ public boolean hasMessage() {
        * required bytes message = 1;
        * @return The message.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getMessage() {
         return message_;
       }
@@ -5279,11 +5170,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getMessage() {
        * @return This builder for chaining.
        */
       public Builder setMessage(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         message_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -5303,6 +5192,7 @@ public Builder clearMessage() {
        * required int32 serializerId = 2;
        * @return Whether the serializerId field is set.
        */
+      @java.lang.Override
       public boolean hasSerializerId() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -5310,6 +5200,7 @@ public boolean hasSerializerId() {
        * required int32 serializerId = 2;
        * @return The serializerId.
        */
+      @java.lang.Override
       public int getSerializerId() {
         return serializerId_;
       }
@@ -5319,8 +5210,9 @@ public int getSerializerId() {
        * @return This builder for chaining.
        */
       public Builder setSerializerId(int value) {
-        bitField0_ |= 0x00000002;
+
         serializerId_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -5340,6 +5232,7 @@ public Builder clearSerializerId() {
        * optional bytes messageManifest = 3;
        * @return Whether the messageManifest field is set.
        */
+      @java.lang.Override
       public boolean hasMessageManifest() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -5347,6 +5240,7 @@ public boolean hasMessageManifest() {
        * optional bytes messageManifest = 3;
        * @return The messageManifest.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
         return messageManifest_;
       }
@@ -5356,11 +5250,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
        * @return This builder for chaining.
        */
       public Builder setMessageManifest(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         messageManifest_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -5380,6 +5272,7 @@ public Builder clearMessageManifest() {
        * required uint64 seqNo = 4;
        * @return Whether the seqNo field is set.
        */
+      @java.lang.Override
       public boolean hasSeqNo() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -5387,6 +5280,7 @@ public boolean hasSeqNo() {
        * required uint64 seqNo = 4;
        * @return The seqNo.
        */
+      @java.lang.Override
       public long getSeqNo() {
         return seqNo_;
       }
@@ -5396,8 +5290,9 @@ public long getSeqNo() {
        * @return This builder for chaining.
        */
       public Builder setSeqNo(long value) {
-        bitField0_ |= 0x00000008;
+
         seqNo_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -5442,11 +5337,11 @@ public Builder setAckReplyTo(org.apache.pekko.remote.ArteryControlFormats.Unique
             throw new NullPointerException();
           }
           ackReplyTo_ = value;
-          onChanged();
         } else {
           ackReplyToBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /**
@@ -5456,11 +5351,11 @@ public Builder setAckReplyTo(
           org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
         if (ackReplyToBuilder_ == null) {
           ackReplyTo_ = builderForValue.build();
-          onChanged();
         } else {
           ackReplyToBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /**
@@ -5469,31 +5364,32 @@ public Builder setAckReplyTo(
       public Builder mergeAckReplyTo(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (ackReplyToBuilder_ == null) {
           if (((bitField0_ & 0x00000010) != 0) &&
-              ackReplyTo_ != null &&
-              ackReplyTo_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
-            ackReplyTo_ =
-              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.newBuilder(ackReplyTo_).mergeFrom(value).buildPartial();
+            ackReplyTo_ != null &&
+            ackReplyTo_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
+            getAckReplyToBuilder().mergeFrom(value);
           } else {
             ackReplyTo_ = value;
           }
-          onChanged();
         } else {
           ackReplyToBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000010;
+        if (ackReplyTo_ != null) {
+          bitField0_ |= 0x00000010;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .UniqueAddress ackReplyTo = 5;
        */
       public Builder clearAckReplyTo() {
-        if (ackReplyToBuilder_ == null) {
-          ackReplyTo_ = null;
-          onChanged();
-        } else {
-          ackReplyToBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000010);
+        ackReplyTo_ = null;
+        if (ackReplyToBuilder_ != null) {
+          ackReplyToBuilder_.dispose();
+          ackReplyToBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -5564,7 +5460,18 @@ public SystemMessageEnvelope parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new SystemMessageEnvelope(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -5622,7 +5529,7 @@ public interface SystemMessageDeliveryAckOrBuilder extends
    *
    * Protobuf type {@code SystemMessageDeliveryAck}
    */
-  public  static final class SystemMessageDeliveryAck extends
+  public static final class SystemMessageDeliveryAck extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:SystemMessageDeliveryAck)
       SystemMessageDeliveryAckOrBuilder {
@@ -5641,67 +5548,6 @@ protected java.lang.Object newInstance(
       return new SystemMessageDeliveryAck();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private SystemMessageDeliveryAck(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              seqNo_ = input.readUInt64();
-              break;
-            }
-            case 18: {
-              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = from_.toBuilder();
-              }
-              from_ = input.readMessage(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(from_);
-                from_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ArteryControlFormats.internal_static_SystemMessageDeliveryAck_descriptor;
@@ -5717,11 +5563,12 @@ private SystemMessageDeliveryAck(
 
     private int bitField0_;
     public static final int SEQNO_FIELD_NUMBER = 1;
-    private long seqNo_;
+    private long seqNo_ = 0L;
     /**
      * required uint64 seqNo = 1;
      * @return Whether the seqNo field is set.
      */
+    @java.lang.Override
     public boolean hasSeqNo() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -5729,6 +5576,7 @@ public boolean hasSeqNo() {
      * required uint64 seqNo = 1;
      * @return The seqNo.
      */
+    @java.lang.Override
     public long getSeqNo() {
       return seqNo_;
     }
@@ -5739,6 +5587,7 @@ public long getSeqNo() {
      * required .UniqueAddress from = 2;
      * @return Whether the from field is set.
      */
+    @java.lang.Override
     public boolean hasFrom() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -5746,12 +5595,14 @@ public boolean hasFrom() {
      * required .UniqueAddress from = 2;
      * @return The from.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getFrom() {
       return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
     }
     /**
      * required .UniqueAddress from = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
       return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
     }
@@ -5788,7 +5639,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getFrom());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -5805,7 +5656,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getFrom());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5830,7 +5681,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getFrom()
             .equals(other.getFrom())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -5850,7 +5701,7 @@ public int hashCode() {
         hash = (37 * hash) + FROM_FIELD_NUMBER;
         hash = (53 * hash) + getFrom().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -5899,11 +5750,13 @@ public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageDelivery
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -5989,14 +5842,13 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         seqNo_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (fromBuilder_ == null) {
-          from_ = null;
-        } else {
-          fromBuilder_.clear();
+        from_ = null;
+        if (fromBuilder_ != null) {
+          fromBuilder_.dispose();
+          fromBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -6023,6 +5875,12 @@ public org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck bui
       @java.lang.Override
       public org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck buildPartial() {
         org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck result = new org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -6030,16 +5888,12 @@ public org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck bui
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (fromBuilder_ == null) {
-            result.from_ = from_;
-          } else {
-            result.from_ = fromBuilder_.build();
-          }
+          result.from_ = fromBuilder_ == null
+              ? from_
+              : fromBuilder_.build();
           to_bitField0_ |= 0x00000002;
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        }
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -6092,7 +5946,7 @@ public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.SystemMess
         if (other.hasFrom()) {
           mergeFrom(other.getFrom());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -6116,17 +5970,42 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                seqNo_ = input.readUInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 18: {
+                input.readMessage(
+                    getFromFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -6136,6 +6015,7 @@ public Builder mergeFrom(
        * required uint64 seqNo = 1;
        * @return Whether the seqNo field is set.
        */
+      @java.lang.Override
       public boolean hasSeqNo() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -6143,6 +6023,7 @@ public boolean hasSeqNo() {
        * required uint64 seqNo = 1;
        * @return The seqNo.
        */
+      @java.lang.Override
       public long getSeqNo() {
         return seqNo_;
       }
@@ -6152,8 +6033,9 @@ public long getSeqNo() {
        * @return This builder for chaining.
        */
       public Builder setSeqNo(long value) {
-        bitField0_ |= 0x00000001;
+
         seqNo_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -6198,11 +6080,11 @@ public Builder setFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddres
             throw new NullPointerException();
           }
           from_ = value;
-          onChanged();
         } else {
           fromBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -6212,11 +6094,11 @@ public Builder setFrom(
           org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
-          onChanged();
         } else {
           fromBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -6225,31 +6107,32 @@ public Builder setFrom(
       public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              from_ != null &&
-              from_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
-            from_ =
-              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
+            from_ != null &&
+            from_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
+            getFromBuilder().mergeFrom(value);
           } else {
             from_ = value;
           }
-          onChanged();
         } else {
           fromBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (from_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .UniqueAddress from = 2;
        */
       public Builder clearFrom() {
-        if (fromBuilder_ == null) {
-          from_ = null;
-          onChanged();
-        } else {
-          fromBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        from_ = null;
+        if (fromBuilder_ != null) {
+          fromBuilder_.dispose();
+          fromBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -6320,7 +6203,18 @@ public SystemMessageDeliveryAck parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new SystemMessageDeliveryAck(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -6414,7 +6308,7 @@ public interface AddressOrBuilder extends
    *
    * Protobuf type {@code Address}
    */
-  public  static final class Address extends
+  public static final class Address extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Address)
       AddressOrBuilder {
@@ -6436,72 +6330,6 @@ protected java.lang.Object newInstance(
       return new Address();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Address(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              protocol_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              system_ = bs;
-              break;
-            }
-            case 26: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000004;
-              hostname_ = bs;
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              port_ = input.readUInt32();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ArteryControlFormats.internal_static_Address_descriptor;
@@ -6517,11 +6345,13 @@ private Address(
 
     private int bitField0_;
     public static final int PROTOCOL_FIELD_NUMBER = 1;
-    private volatile java.lang.Object protocol_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object protocol_ = "";
     /**
      * required string protocol = 1;
      * @return Whether the protocol field is set.
      */
+    @java.lang.Override
     public boolean hasProtocol() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -6529,6 +6359,7 @@ public boolean hasProtocol() {
      * required string protocol = 1;
      * @return The protocol.
      */
+    @java.lang.Override
     public java.lang.String getProtocol() {
       java.lang.Object ref = protocol_;
       if (ref instanceof java.lang.String) {
@@ -6547,6 +6378,7 @@ public java.lang.String getProtocol() {
      * required string protocol = 1;
      * @return The bytes for protocol.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getProtocolBytes() {
       java.lang.Object ref = protocol_;
@@ -6562,11 +6394,13 @@ public java.lang.String getProtocol() {
     }
 
     public static final int SYSTEM_FIELD_NUMBER = 2;
-    private volatile java.lang.Object system_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object system_ = "";
     /**
      * required string system = 2;
      * @return Whether the system field is set.
      */
+    @java.lang.Override
     public boolean hasSystem() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -6574,6 +6408,7 @@ public boolean hasSystem() {
      * required string system = 2;
      * @return The system.
      */
+    @java.lang.Override
     public java.lang.String getSystem() {
       java.lang.Object ref = system_;
       if (ref instanceof java.lang.String) {
@@ -6592,6 +6427,7 @@ public java.lang.String getSystem() {
      * required string system = 2;
      * @return The bytes for system.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getSystemBytes() {
       java.lang.Object ref = system_;
@@ -6607,11 +6443,13 @@ public java.lang.String getSystem() {
     }
 
     public static final int HOSTNAME_FIELD_NUMBER = 3;
-    private volatile java.lang.Object hostname_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object hostname_ = "";
     /**
      * required string hostname = 3;
      * @return Whether the hostname field is set.
      */
+    @java.lang.Override
     public boolean hasHostname() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -6619,6 +6457,7 @@ public boolean hasHostname() {
      * required string hostname = 3;
      * @return The hostname.
      */
+    @java.lang.Override
     public java.lang.String getHostname() {
       java.lang.Object ref = hostname_;
       if (ref instanceof java.lang.String) {
@@ -6637,6 +6476,7 @@ public java.lang.String getHostname() {
      * required string hostname = 3;
      * @return The bytes for hostname.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getHostnameBytes() {
       java.lang.Object ref = hostname_;
@@ -6652,11 +6492,12 @@ public java.lang.String getHostname() {
     }
 
     public static final int PORT_FIELD_NUMBER = 4;
-    private int port_;
+    private int port_ = 0;
     /**
      * required uint32 port = 4;
      * @return Whether the port field is set.
      */
+    @java.lang.Override
     public boolean hasPort() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -6664,6 +6505,7 @@ public boolean hasPort() {
      * required uint32 port = 4;
      * @return The port.
      */
+    @java.lang.Override
     public int getPort() {
       return port_;
     }
@@ -6710,7 +6552,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeUInt32(4, port_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -6732,7 +6574,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(4, port_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -6767,7 +6609,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getPort()
             != other.getPort()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -6794,7 +6636,7 @@ public int hashCode() {
         hash = (37 * hash) + PORT_FIELD_NUMBER;
         hash = (53 * hash) + getPort();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -6843,11 +6685,13 @@ public static org.apache.pekko.remote.ArteryControlFormats.Address parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.Address parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.Address parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -6916,30 +6760,22 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.ArteryControlFormats.Address.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         protocol_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         system_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         hostname_ = "";
-        bitField0_ = (bitField0_ & ~0x00000004);
         port_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -6966,27 +6802,31 @@ public org.apache.pekko.remote.ArteryControlFormats.Address build() {
       @java.lang.Override
       public org.apache.pekko.remote.ArteryControlFormats.Address buildPartial() {
         org.apache.pekko.remote.ArteryControlFormats.Address result = new org.apache.pekko.remote.ArteryControlFormats.Address(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ArteryControlFormats.Address result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.protocol_ = protocol_;
           to_bitField0_ |= 0x00000001;
         }
-        result.protocol_ = protocol_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.system_ = system_;
           to_bitField0_ |= 0x00000002;
         }
-        result.system_ = system_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.hostname_ = hostname_;
           to_bitField0_ |= 0x00000004;
         }
-        result.hostname_ = hostname_;
         if (((from_bitField0_ & 0x00000008) != 0)) {
           result.port_ = port_;
           to_bitField0_ |= 0x00000008;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -7034,24 +6874,24 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.Address other) {
         if (other == org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance()) return this;
         if (other.hasProtocol()) {
-          bitField0_ |= 0x00000001;
           protocol_ = other.protocol_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasSystem()) {
-          bitField0_ |= 0x00000002;
           system_ = other.system_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasHostname()) {
-          bitField0_ |= 0x00000004;
           hostname_ = other.hostname_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
         if (other.hasPort()) {
           setPort(other.getPort());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -7078,17 +6918,50 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ArteryControlFormats.Address parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                protocol_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                system_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 26: {
+                hostname_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              case 32: {
+                port_ = input.readUInt32();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.Address) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -7143,11 +7016,9 @@ public java.lang.String getProtocol() {
        */
       public Builder setProtocol(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         protocol_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -7156,8 +7027,8 @@ public Builder setProtocol(
        * @return This builder for chaining.
        */
       public Builder clearProtocol() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         protocol_ = getDefaultInstance().getProtocol();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -7168,11 +7039,9 @@ public Builder clearProtocol() {
        */
       public Builder setProtocolBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         protocol_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -7227,11 +7096,9 @@ public java.lang.String getSystem() {
        */
       public Builder setSystem(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         system_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -7240,8 +7107,8 @@ public Builder setSystem(
        * @return This builder for chaining.
        */
       public Builder clearSystem() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         system_ = getDefaultInstance().getSystem();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -7252,11 +7119,9 @@ public Builder clearSystem() {
        */
       public Builder setSystemBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         system_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -7311,11 +7176,9 @@ public java.lang.String getHostname() {
        */
       public Builder setHostname(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         hostname_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -7324,8 +7187,8 @@ public Builder setHostname(
        * @return This builder for chaining.
        */
       public Builder clearHostname() {
-        bitField0_ = (bitField0_ & ~0x00000004);
         hostname_ = getDefaultInstance().getHostname();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -7336,11 +7199,9 @@ public Builder clearHostname() {
        */
       public Builder setHostnameBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         hostname_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -7350,6 +7211,7 @@ public Builder setHostnameBytes(
        * required uint32 port = 4;
        * @return Whether the port field is set.
        */
+      @java.lang.Override
       public boolean hasPort() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -7357,6 +7219,7 @@ public boolean hasPort() {
        * required uint32 port = 4;
        * @return The port.
        */
+      @java.lang.Override
       public int getPort() {
         return port_;
       }
@@ -7366,8 +7229,9 @@ public int getPort() {
        * @return This builder for chaining.
        */
       public Builder setPort(int value) {
-        bitField0_ |= 0x00000008;
+
         port_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -7414,7 +7278,18 @@ public Address parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Address(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -7472,7 +7347,7 @@ public interface UniqueAddressOrBuilder extends
    *
    * Protobuf type {@code UniqueAddress}
    */
-  public  static final class UniqueAddress extends
+  public static final class UniqueAddress extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:UniqueAddress)
       UniqueAddressOrBuilder {
@@ -7491,67 +7366,6 @@ protected java.lang.Object newInstance(
       return new UniqueAddress();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private UniqueAddress(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.ArteryControlFormats.Address.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = address_.toBuilder();
-              }
-              address_ = input.readMessage(org.apache.pekko.remote.ArteryControlFormats.Address.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(address_);
-                address_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              uid_ = input.readUInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ArteryControlFormats.internal_static_UniqueAddress_descriptor;
@@ -7572,6 +7386,7 @@ private UniqueAddress(
      * required .Address address = 1;
      * @return Whether the address field is set.
      */
+    @java.lang.Override
     public boolean hasAddress() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -7579,22 +7394,25 @@ public boolean hasAddress() {
      * required .Address address = 1;
      * @return The address.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ArteryControlFormats.Address getAddress() {
       return address_ == null ? org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance() : address_;
     }
     /**
      * required .Address address = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ArteryControlFormats.AddressOrBuilder getAddressOrBuilder() {
       return address_ == null ? org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance() : address_;
     }
 
     public static final int UID_FIELD_NUMBER = 2;
-    private long uid_;
+    private long uid_ = 0L;
     /**
      * required uint64 uid = 2;
      * @return Whether the uid field is set.
      */
+    @java.lang.Override
     public boolean hasUid() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -7602,6 +7420,7 @@ public boolean hasUid() {
      * required uint64 uid = 2;
      * @return The uid.
      */
+    @java.lang.Override
     public long getUid() {
       return uid_;
     }
@@ -7638,7 +7457,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeUInt64(2, uid_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -7655,7 +7474,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt64Size(2, uid_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -7680,7 +7499,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getUid()
             != other.getUid()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -7700,7 +7519,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getUid());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -7749,11 +7568,13 @@ public static org.apache.pekko.remote.ArteryControlFormats.UniqueAddress parseFr
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.UniqueAddress parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.UniqueAddress parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -7839,14 +7660,13 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (addressBuilder_ == null) {
-          address_ = null;
-        } else {
-          addressBuilder_.clear();
+        bitField0_ = 0;
+        address_ = null;
+        if (addressBuilder_ != null) {
+          addressBuilder_.dispose();
+          addressBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         uid_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -7873,23 +7693,25 @@ public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress build() {
       @java.lang.Override
       public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress buildPartial() {
         org.apache.pekko.remote.ArteryControlFormats.UniqueAddress result = new org.apache.pekko.remote.ArteryControlFormats.UniqueAddress(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (addressBuilder_ == null) {
-            result.address_ = address_;
-          } else {
-            result.address_ = addressBuilder_.build();
-          }
+          result.address_ = addressBuilder_ == null
+              ? address_
+              : addressBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.uid_ = uid_;
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -7942,7 +7764,7 @@ public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddr
         if (other.hasUid()) {
           setUid(other.getUid());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -7966,17 +7788,42 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ArteryControlFormats.UniqueAddress parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getAddressFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                uid_ = input.readUInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.UniqueAddress) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -8011,11 +7858,11 @@ public Builder setAddress(org.apache.pekko.remote.ArteryControlFormats.Address v
             throw new NullPointerException();
           }
           address_ = value;
-          onChanged();
         } else {
           addressBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -8025,11 +7872,11 @@ public Builder setAddress(
           org.apache.pekko.remote.ArteryControlFormats.Address.Builder builderForValue) {
         if (addressBuilder_ == null) {
           address_ = builderForValue.build();
-          onChanged();
         } else {
           addressBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -8038,31 +7885,32 @@ public Builder setAddress(
       public Builder mergeAddress(org.apache.pekko.remote.ArteryControlFormats.Address value) {
         if (addressBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              address_ != null &&
-              address_ != org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance()) {
-            address_ =
-              org.apache.pekko.remote.ArteryControlFormats.Address.newBuilder(address_).mergeFrom(value).buildPartial();
+            address_ != null &&
+            address_ != org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance()) {
+            getAddressBuilder().mergeFrom(value);
           } else {
             address_ = value;
           }
-          onChanged();
         } else {
           addressBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (address_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Address address = 1;
        */
       public Builder clearAddress() {
-        if (addressBuilder_ == null) {
-          address_ = null;
-          onChanged();
-        } else {
-          addressBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        address_ = null;
+        if (addressBuilder_ != null) {
+          addressBuilder_.dispose();
+          addressBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -8106,6 +7954,7 @@ public org.apache.pekko.remote.ArteryControlFormats.AddressOrBuilder getAddressO
        * required uint64 uid = 2;
        * @return Whether the uid field is set.
        */
+      @java.lang.Override
       public boolean hasUid() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -8113,6 +7962,7 @@ public boolean hasUid() {
        * required uint64 uid = 2;
        * @return The uid.
        */
+      @java.lang.Override
       public long getUid() {
         return uid_;
       }
@@ -8122,8 +7972,9 @@ public long getUid() {
        * @return This builder for chaining.
        */
       public Builder setUid(long value) {
-        bitField0_ |= 0x00000002;
+
         uid_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -8170,7 +8021,18 @@ public UniqueAddress parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new UniqueAddress(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -8213,7 +8075,7 @@ public interface ArteryHeartbeatRspOrBuilder extends
    *
    * Protobuf type {@code ArteryHeartbeatRsp}
    */
-  public  static final class ArteryHeartbeatRsp extends
+  public static final class ArteryHeartbeatRsp extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ArteryHeartbeatRsp)
       ArteryHeartbeatRspOrBuilder {
@@ -8232,54 +8094,6 @@ protected java.lang.Object newInstance(
       return new ArteryHeartbeatRsp();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ArteryHeartbeatRsp(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              uid_ = input.readUInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ArteryControlFormats.internal_static_ArteryHeartbeatRsp_descriptor;
@@ -8295,11 +8109,12 @@ private ArteryHeartbeatRsp(
 
     private int bitField0_;
     public static final int UID_FIELD_NUMBER = 1;
-    private long uid_;
+    private long uid_ = 0L;
     /**
      * required uint64 uid = 1;
      * @return Whether the uid field is set.
      */
+    @java.lang.Override
     public boolean hasUid() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -8307,6 +8122,7 @@ public boolean hasUid() {
      * required uint64 uid = 1;
      * @return The uid.
      */
+    @java.lang.Override
     public long getUid() {
       return uid_;
     }
@@ -8332,7 +8148,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeUInt64(1, uid_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -8345,7 +8161,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt64Size(1, uid_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -8365,7 +8181,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getUid()
             != other.getUid()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -8381,7 +8197,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getUid());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -8430,11 +8246,13 @@ public static org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp pa
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -8503,24 +8321,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         uid_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -8547,15 +8360,19 @@ public org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp build() {
       @java.lang.Override
       public org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp buildPartial() {
         org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp result = new org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.uid_ = uid_;
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -8605,7 +8422,7 @@ public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.ArteryHear
         if (other.hasUid()) {
           setUid(other.getUid());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -8623,17 +8440,35 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                uid_ = input.readUInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -8643,6 +8478,7 @@ public Builder mergeFrom(
        * required uint64 uid = 1;
        * @return Whether the uid field is set.
        */
+      @java.lang.Override
       public boolean hasUid() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -8650,6 +8486,7 @@ public boolean hasUid() {
        * required uint64 uid = 1;
        * @return The uid.
        */
+      @java.lang.Override
       public long getUid() {
         return uid_;
       }
@@ -8659,8 +8496,9 @@ public long getUid() {
        * @return This builder for chaining.
        */
       public Builder setUid(long value) {
-        bitField0_ |= 0x00000001;
+
         uid_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8707,7 +8545,18 @@ public ArteryHeartbeatRsp parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ArteryHeartbeatRsp(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -8745,7 +8594,7 @@ public interface FlushAckOrBuilder extends
   /**
    * Protobuf type {@code FlushAck}
    */
-  public  static final class FlushAck extends
+  public static final class FlushAck extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:FlushAck)
       FlushAckOrBuilder {
@@ -8764,54 +8613,6 @@ protected java.lang.Object newInstance(
       return new FlushAck();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private FlushAck(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              expectedAcks_ = input.readInt32();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ArteryControlFormats.internal_static_FlushAck_descriptor;
@@ -8827,11 +8628,12 @@ private FlushAck(
 
     private int bitField0_;
     public static final int EXPECTEDACKS_FIELD_NUMBER = 1;
-    private int expectedAcks_;
+    private int expectedAcks_ = 0;
     /**
      * optional int32 expectedAcks = 1;
      * @return Whether the expectedAcks field is set.
      */
+    @java.lang.Override
     public boolean hasExpectedAcks() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -8839,6 +8641,7 @@ public boolean hasExpectedAcks() {
      * optional int32 expectedAcks = 1;
      * @return The expectedAcks.
      */
+    @java.lang.Override
     public int getExpectedAcks() {
       return expectedAcks_;
     }
@@ -8860,7 +8663,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeInt32(1, expectedAcks_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -8873,7 +8676,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(1, expectedAcks_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -8893,7 +8696,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getExpectedAcks()
             != other.getExpectedAcks()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -8908,7 +8711,7 @@ public int hashCode() {
         hash = (37 * hash) + EXPECTEDACKS_FIELD_NUMBER;
         hash = (53 * hash) + getExpectedAcks();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -8957,11 +8760,13 @@ public static org.apache.pekko.remote.ArteryControlFormats.FlushAck parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.FlushAck parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ArteryControlFormats.FlushAck parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -9025,24 +8830,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.ArteryControlFormats.FlushAck.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         expectedAcks_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -9069,15 +8869,19 @@ public org.apache.pekko.remote.ArteryControlFormats.FlushAck build() {
       @java.lang.Override
       public org.apache.pekko.remote.ArteryControlFormats.FlushAck buildPartial() {
         org.apache.pekko.remote.ArteryControlFormats.FlushAck result = new org.apache.pekko.remote.ArteryControlFormats.FlushAck(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ArteryControlFormats.FlushAck result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.expectedAcks_ = expectedAcks_;
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -9127,7 +8931,7 @@ public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.FlushAck o
         if (other.hasExpectedAcks()) {
           setExpectedAcks(other.getExpectedAcks());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -9142,17 +8946,35 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ArteryControlFormats.FlushAck parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                expectedAcks_ = input.readInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.FlushAck) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -9162,6 +8984,7 @@ public Builder mergeFrom(
        * optional int32 expectedAcks = 1;
        * @return Whether the expectedAcks field is set.
        */
+      @java.lang.Override
       public boolean hasExpectedAcks() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -9169,6 +8992,7 @@ public boolean hasExpectedAcks() {
        * optional int32 expectedAcks = 1;
        * @return The expectedAcks.
        */
+      @java.lang.Override
       public int getExpectedAcks() {
         return expectedAcks_;
       }
@@ -9178,8 +9002,9 @@ public int getExpectedAcks() {
        * @return This builder for chaining.
        */
       public Builder setExpectedAcks(int value) {
-        bitField0_ |= 0x00000001;
+
         expectedAcks_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -9226,7 +9051,18 @@ public FlushAck parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new FlushAck(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
diff --git a/remote/src/main/java/org/apache/pekko/remote/ContainerFormats.java b/remote/src/main/java/org/apache/pekko/remote/ContainerFormats.java
index d75c99ad4d3..3419388e3c5 100644
--- a/remote/src/main/java/org/apache/pekko/remote/ContainerFormats.java
+++ b/remote/src/main/java/org/apache/pekko/remote/ContainerFormats.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2021-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ContainerFormats.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.remote;
 
 public final class ContainerFormats {
@@ -215,7 +216,7 @@ org.apache.pekko.remote.ContainerFormats.SelectionOrBuilder getPatternOrBuilder(
   /**
    * Protobuf type {@code SelectionEnvelope}
    */
-  public  static final class SelectionEnvelope extends
+  public static final class SelectionEnvelope extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:SelectionEnvelope)
       SelectionEnvelopeOrBuilder {
@@ -237,81 +238,6 @@ protected java.lang.Object newInstance(
       return new SelectionEnvelope();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private SelectionEnvelope(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              bitField0_ |= 0x00000001;
-              enclosedMessage_ = input.readBytes();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              serializerId_ = input.readInt32();
-              break;
-            }
-            case 26: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                pattern_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              pattern_.add(
-                  input.readMessage(org.apache.pekko.remote.ContainerFormats.Selection.PARSER, extensionRegistry));
-              break;
-            }
-            case 34: {
-              bitField0_ |= 0x00000004;
-              messageManifest_ = input.readBytes();
-              break;
-            }
-            case 40: {
-              bitField0_ |= 0x00000008;
-              wildcardFanOut_ = input.readBool();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          pattern_ = java.util.Collections.unmodifiableList(pattern_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ContainerFormats.internal_static_SelectionEnvelope_descriptor;
@@ -327,11 +253,12 @@ private SelectionEnvelope(
 
     private int bitField0_;
     public static final int ENCLOSEDMESSAGE_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.ByteString enclosedMessage_;
+    private org.apache.pekko.protobufv3.internal.ByteString enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * required bytes enclosedMessage = 1;
      * @return Whether the enclosedMessage field is set.
      */
+    @java.lang.Override
     public boolean hasEnclosedMessage() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -339,16 +266,18 @@ public boolean hasEnclosedMessage() {
      * required bytes enclosedMessage = 1;
      * @return The enclosedMessage.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
       return enclosedMessage_;
     }
 
     public static final int SERIALIZERID_FIELD_NUMBER = 2;
-    private int serializerId_;
+    private int serializerId_ = 0;
     /**
      * required int32 serializerId = 2;
      * @return Whether the serializerId field is set.
      */
+    @java.lang.Override
     public boolean hasSerializerId() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -356,21 +285,25 @@ public boolean hasSerializerId() {
      * required int32 serializerId = 2;
      * @return The serializerId.
      */
+    @java.lang.Override
     public int getSerializerId() {
       return serializerId_;
     }
 
     public static final int PATTERN_FIELD_NUMBER = 3;
+    @SuppressWarnings("serial")
     private java.util.List pattern_;
     /**
      * repeated .Selection pattern = 3;
      */
+    @java.lang.Override
     public java.util.List getPatternList() {
       return pattern_;
     }
     /**
      * repeated .Selection pattern = 3;
      */
+    @java.lang.Override
     public java.util.List 
         getPatternOrBuilderList() {
       return pattern_;
@@ -378,29 +311,33 @@ public java.util.List getPat
     /**
      * repeated .Selection pattern = 3;
      */
+    @java.lang.Override
     public int getPatternCount() {
       return pattern_.size();
     }
     /**
      * repeated .Selection pattern = 3;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.Selection getPattern(int index) {
       return pattern_.get(index);
     }
     /**
      * repeated .Selection pattern = 3;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.SelectionOrBuilder getPatternOrBuilder(
         int index) {
       return pattern_.get(index);
     }
 
     public static final int MESSAGEMANIFEST_FIELD_NUMBER = 4;
-    private org.apache.pekko.protobufv3.internal.ByteString messageManifest_;
+    private org.apache.pekko.protobufv3.internal.ByteString messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * optional bytes messageManifest = 4;
      * @return Whether the messageManifest field is set.
      */
+    @java.lang.Override
     public boolean hasMessageManifest() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -408,12 +345,13 @@ public boolean hasMessageManifest() {
      * optional bytes messageManifest = 4;
      * @return The messageManifest.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
       return messageManifest_;
     }
 
     public static final int WILDCARDFANOUT_FIELD_NUMBER = 5;
-    private boolean wildcardFanOut_;
+    private boolean wildcardFanOut_ = false;
     /**
      * 
      * optional for pre 2.3.4 compatibility 
@@ -422,6 +360,7 @@ public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
      * optional bool wildcardFanOut = 5;
      * @return Whether the wildcardFanOut field is set.
      */
+    @java.lang.Override
     public boolean hasWildcardFanOut() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -433,6 +372,7 @@ public boolean hasWildcardFanOut() {
      * optional bool wildcardFanOut = 5;
      * @return The wildcardFanOut.
      */
+    @java.lang.Override
     public boolean getWildcardFanOut() {
       return wildcardFanOut_;
     }
@@ -480,7 +420,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeBool(5, wildcardFanOut_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -509,7 +449,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(5, wildcardFanOut_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -546,7 +486,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getWildcardFanOut()
             != other.getWildcardFanOut()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -578,7 +518,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getWildcardFanOut());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -627,11 +567,13 @@ public static org.apache.pekko.remote.ContainerFormats.SelectionEnvelope parseFr
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.SelectionEnvelope parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.SelectionEnvelope parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -695,37 +637,29 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.ContainerFormats.SelectionEnvelope.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getPatternFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
         serializerId_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         if (patternBuilder_ == null) {
           pattern_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
         } else {
+          pattern_ = null;
           patternBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000004);
         messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000008);
         wildcardFanOut_ = false;
-        bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
@@ -752,16 +686,13 @@ public org.apache.pekko.remote.ContainerFormats.SelectionEnvelope build() {
       @java.lang.Override
       public org.apache.pekko.remote.ContainerFormats.SelectionEnvelope buildPartial() {
         org.apache.pekko.remote.ContainerFormats.SelectionEnvelope result = new org.apache.pekko.remote.ContainerFormats.SelectionEnvelope(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.enclosedMessage_ = enclosedMessage_;
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.serializerId_ = serializerId_;
-          to_bitField0_ |= 0x00000002;
-        }
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.remote.ContainerFormats.SelectionEnvelope result) {
         if (patternBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0)) {
             pattern_ = java.util.Collections.unmodifiableList(pattern_);
@@ -771,17 +702,28 @@ public org.apache.pekko.remote.ContainerFormats.SelectionEnvelope buildPartial()
         } else {
           result.pattern_ = patternBuilder_.build();
         }
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ContainerFormats.SelectionEnvelope result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.enclosedMessage_ = enclosedMessage_;
+          to_bitField0_ |= 0x00000001;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.serializerId_ = serializerId_;
+          to_bitField0_ |= 0x00000002;
+        }
         if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.messageManifest_ = messageManifest_;
           to_bitField0_ |= 0x00000004;
         }
-        result.messageManifest_ = messageManifest_;
         if (((from_bitField0_ & 0x00000010) != 0)) {
           result.wildcardFanOut_ = wildcardFanOut_;
           to_bitField0_ |= 0x00000008;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -866,7 +808,7 @@ public Builder mergeFrom(org.apache.pekko.remote.ContainerFormats.SelectionEnvel
         if (other.hasWildcardFanOut()) {
           setWildcardFanOut(other.getWildcardFanOut());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -892,17 +834,63 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ContainerFormats.SelectionEnvelope parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                enclosedMessage_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                serializerId_ = input.readInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 26: {
+                org.apache.pekko.remote.ContainerFormats.Selection m =
+                    input.readMessage(
+                        org.apache.pekko.remote.ContainerFormats.Selection.PARSER,
+                        extensionRegistry);
+                if (patternBuilder_ == null) {
+                  ensurePatternIsMutable();
+                  pattern_.add(m);
+                } else {
+                  patternBuilder_.addMessage(m);
+                }
+                break;
+              } // case 26
+              case 34: {
+                messageManifest_ = input.readBytes();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 34
+              case 40: {
+                wildcardFanOut_ = input.readBool();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 40
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ContainerFormats.SelectionEnvelope) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -912,6 +900,7 @@ public Builder mergeFrom(
        * required bytes enclosedMessage = 1;
        * @return Whether the enclosedMessage field is set.
        */
+      @java.lang.Override
       public boolean hasEnclosedMessage() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -919,6 +908,7 @@ public boolean hasEnclosedMessage() {
        * required bytes enclosedMessage = 1;
        * @return The enclosedMessage.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
         return enclosedMessage_;
       }
@@ -928,11 +918,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
        * @return This builder for chaining.
        */
       public Builder setEnclosedMessage(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         enclosedMessage_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -952,6 +940,7 @@ public Builder clearEnclosedMessage() {
        * required int32 serializerId = 2;
        * @return Whether the serializerId field is set.
        */
+      @java.lang.Override
       public boolean hasSerializerId() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -959,6 +948,7 @@ public boolean hasSerializerId() {
        * required int32 serializerId = 2;
        * @return The serializerId.
        */
+      @java.lang.Override
       public int getSerializerId() {
         return serializerId_;
       }
@@ -968,8 +958,9 @@ public int getSerializerId() {
        * @return This builder for chaining.
        */
       public Builder setSerializerId(int value) {
-        bitField0_ |= 0x00000002;
+
         serializerId_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1229,6 +1220,7 @@ public org.apache.pekko.remote.ContainerFormats.Selection.Builder addPatternBuil
        * optional bytes messageManifest = 4;
        * @return Whether the messageManifest field is set.
        */
+      @java.lang.Override
       public boolean hasMessageManifest() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -1236,6 +1228,7 @@ public boolean hasMessageManifest() {
        * optional bytes messageManifest = 4;
        * @return The messageManifest.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
         return messageManifest_;
       }
@@ -1245,11 +1238,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
        * @return This builder for chaining.
        */
       public Builder setMessageManifest(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
+        if (value == null) { throw new NullPointerException(); }
         messageManifest_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -1273,6 +1264,7 @@ public Builder clearMessageManifest() {
        * optional bool wildcardFanOut = 5;
        * @return Whether the wildcardFanOut field is set.
        */
+      @java.lang.Override
       public boolean hasWildcardFanOut() {
         return ((bitField0_ & 0x00000010) != 0);
       }
@@ -1284,6 +1276,7 @@ public boolean hasWildcardFanOut() {
        * optional bool wildcardFanOut = 5;
        * @return The wildcardFanOut.
        */
+      @java.lang.Override
       public boolean getWildcardFanOut() {
         return wildcardFanOut_;
       }
@@ -1297,8 +1290,9 @@ public boolean getWildcardFanOut() {
        * @return This builder for chaining.
        */
       public Builder setWildcardFanOut(boolean value) {
-        bitField0_ |= 0x00000010;
+
         wildcardFanOut_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1349,7 +1343,18 @@ public SelectionEnvelope parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new SelectionEnvelope(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -1404,7 +1409,7 @@ public interface SelectionOrBuilder extends
   /**
    * Protobuf type {@code Selection}
    */
-  public  static final class Selection extends
+  public static final class Selection extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Selection)
       SelectionOrBuilder {
@@ -1425,67 +1430,6 @@ protected java.lang.Object newInstance(
       return new Selection();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Selection(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              int rawValue = input.readEnum();
-                @SuppressWarnings("deprecation")
-              org.apache.pekko.remote.ContainerFormats.PatternType value = org.apache.pekko.remote.ContainerFormats.PatternType.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(1, rawValue);
-              } else {
-                bitField0_ |= 0x00000001;
-                type_ = rawValue;
-              }
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              matcher_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ContainerFormats.internal_static_Selection_descriptor;
@@ -1501,30 +1445,31 @@ private Selection(
 
     private int bitField0_;
     public static final int TYPE_FIELD_NUMBER = 1;
-    private int type_;
+    private int type_ = 0;
     /**
      * required .PatternType type = 1;
      * @return Whether the type field is set.
      */
-    public boolean hasType() {
+    @java.lang.Override public boolean hasType() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      * required .PatternType type = 1;
      * @return The type.
      */
-    public org.apache.pekko.remote.ContainerFormats.PatternType getType() {
-      @SuppressWarnings("deprecation")
-      org.apache.pekko.remote.ContainerFormats.PatternType result = org.apache.pekko.remote.ContainerFormats.PatternType.valueOf(type_);
+    @java.lang.Override public org.apache.pekko.remote.ContainerFormats.PatternType getType() {
+      org.apache.pekko.remote.ContainerFormats.PatternType result = org.apache.pekko.remote.ContainerFormats.PatternType.forNumber(type_);
       return result == null ? org.apache.pekko.remote.ContainerFormats.PatternType.PARENT : result;
     }
 
     public static final int MATCHER_FIELD_NUMBER = 2;
-    private volatile java.lang.Object matcher_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object matcher_ = "";
     /**
      * optional string matcher = 2;
      * @return Whether the matcher field is set.
      */
+    @java.lang.Override
     public boolean hasMatcher() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -1532,6 +1477,7 @@ public boolean hasMatcher() {
      * optional string matcher = 2;
      * @return The matcher.
      */
+    @java.lang.Override
     public java.lang.String getMatcher() {
       java.lang.Object ref = matcher_;
       if (ref instanceof java.lang.String) {
@@ -1550,6 +1496,7 @@ public java.lang.String getMatcher() {
      * optional string matcher = 2;
      * @return The bytes for matcher.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getMatcherBytes() {
       java.lang.Object ref = matcher_;
@@ -1588,7 +1535,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, matcher_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -1604,7 +1551,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000002) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, matcher_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1628,7 +1575,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getMatcher()
             .equals(other.getMatcher())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1647,7 +1594,7 @@ public int hashCode() {
         hash = (37 * hash) + MATCHER_FIELD_NUMBER;
         hash = (53 * hash) + getMatcher().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1696,11 +1643,13 @@ public static org.apache.pekko.remote.ContainerFormats.Selection parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.Selection parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.Selection parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -1764,26 +1713,20 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.ContainerFormats.Selection.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         type_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000001);
         matcher_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -1810,19 +1753,23 @@ public org.apache.pekko.remote.ContainerFormats.Selection build() {
       @java.lang.Override
       public org.apache.pekko.remote.ContainerFormats.Selection buildPartial() {
         org.apache.pekko.remote.ContainerFormats.Selection result = new org.apache.pekko.remote.ContainerFormats.Selection(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ContainerFormats.Selection result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.type_ = type_;
           to_bitField0_ |= 0x00000001;
         }
-        result.type_ = type_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.matcher_ = matcher_;
           to_bitField0_ |= 0x00000002;
         }
-        result.matcher_ = matcher_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1873,11 +1820,11 @@ public Builder mergeFrom(org.apache.pekko.remote.ContainerFormats.Selection othe
           setType(other.getType());
         }
         if (other.hasMatcher()) {
-          bitField0_ |= 0x00000002;
           matcher_ = other.matcher_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1895,17 +1842,47 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ContainerFormats.Selection parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                int tmpRaw = input.readEnum();
+                org.apache.pekko.remote.ContainerFormats.PatternType tmpValue =
+                    org.apache.pekko.remote.ContainerFormats.PatternType.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(1, tmpRaw);
+                } else {
+                  type_ = tmpRaw;
+                  bitField0_ |= 0x00000001;
+                }
+                break;
+              } // case 8
+              case 18: {
+                matcher_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ContainerFormats.Selection) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -1915,16 +1892,16 @@ public Builder mergeFrom(
        * required .PatternType type = 1;
        * @return Whether the type field is set.
        */
-      public boolean hasType() {
+      @java.lang.Override public boolean hasType() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        * required .PatternType type = 1;
        * @return The type.
        */
+      @java.lang.Override
       public org.apache.pekko.remote.ContainerFormats.PatternType getType() {
-        @SuppressWarnings("deprecation")
-        org.apache.pekko.remote.ContainerFormats.PatternType result = org.apache.pekko.remote.ContainerFormats.PatternType.valueOf(type_);
+        org.apache.pekko.remote.ContainerFormats.PatternType result = org.apache.pekko.remote.ContainerFormats.PatternType.forNumber(type_);
         return result == null ? org.apache.pekko.remote.ContainerFormats.PatternType.PARENT : result;
       }
       /**
@@ -2002,11 +1979,9 @@ public java.lang.String getMatcher() {
        */
       public Builder setMatcher(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         matcher_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2015,8 +1990,8 @@ public Builder setMatcher(
        * @return This builder for chaining.
        */
       public Builder clearMatcher() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         matcher_ = getDefaultInstance().getMatcher();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -2027,11 +2002,9 @@ public Builder clearMatcher() {
        */
       public Builder setMatcherBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         matcher_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2068,7 +2041,18 @@ public Selection parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Selection(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -2110,7 +2094,7 @@ public interface IdentifyOrBuilder extends
   /**
    * Protobuf type {@code Identify}
    */
-  public  static final class Identify extends
+  public static final class Identify extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Identify)
       IdentifyOrBuilder {
@@ -2129,62 +2113,6 @@ protected java.lang.Object newInstance(
       return new Identify();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Identify(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = messageId_.toBuilder();
-              }
-              messageId_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(messageId_);
-                messageId_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ContainerFormats.internal_static_Identify_descriptor;
@@ -2205,6 +2133,7 @@ private Identify(
      * required .Payload messageId = 1;
      * @return Whether the messageId field is set.
      */
+    @java.lang.Override
     public boolean hasMessageId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -2212,12 +2141,14 @@ public boolean hasMessageId() {
      * required .Payload messageId = 1;
      * @return The messageId.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.Payload getMessageId() {
       return messageId_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : messageId_;
     }
     /**
      * required .Payload messageId = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageIdOrBuilder() {
       return messageId_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : messageId_;
     }
@@ -2247,7 +2178,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getMessageId());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -2260,7 +2191,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getMessageId());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2280,7 +2211,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getMessageId()
             .equals(other.getMessageId())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -2295,7 +2226,7 @@ public int hashCode() {
         hash = (37 * hash) + MESSAGEID_FIELD_NUMBER;
         hash = (53 * hash) + getMessageId().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -2344,11 +2275,13 @@ public static org.apache.pekko.remote.ContainerFormats.Identify parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.Identify parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.Identify parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -2429,12 +2362,12 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (messageIdBuilder_ == null) {
-          messageId_ = null;
-        } else {
-          messageIdBuilder_.clear();
+        bitField0_ = 0;
+        messageId_ = null;
+        if (messageIdBuilder_ != null) {
+          messageIdBuilder_.dispose();
+          messageIdBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -2461,19 +2394,21 @@ public org.apache.pekko.remote.ContainerFormats.Identify build() {
       @java.lang.Override
       public org.apache.pekko.remote.ContainerFormats.Identify buildPartial() {
         org.apache.pekko.remote.ContainerFormats.Identify result = new org.apache.pekko.remote.ContainerFormats.Identify(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ContainerFormats.Identify result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (messageIdBuilder_ == null) {
-            result.messageId_ = messageId_;
-          } else {
-            result.messageId_ = messageIdBuilder_.build();
-          }
+          result.messageId_ = messageIdBuilder_ == null
+              ? messageId_
+              : messageIdBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -2523,7 +2458,7 @@ public Builder mergeFrom(org.apache.pekko.remote.ContainerFormats.Identify other
         if (other.hasMessageId()) {
           mergeMessageId(other.getMessageId());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -2544,17 +2479,37 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ContainerFormats.Identify parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getMessageIdFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ContainerFormats.Identify) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -2589,11 +2544,11 @@ public Builder setMessageId(org.apache.pekko.remote.ContainerFormats.Payload val
             throw new NullPointerException();
           }
           messageId_ = value;
-          onChanged();
         } else {
           messageIdBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -2603,11 +2558,11 @@ public Builder setMessageId(
           org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (messageIdBuilder_ == null) {
           messageId_ = builderForValue.build();
-          onChanged();
         } else {
           messageIdBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -2616,31 +2571,32 @@ public Builder setMessageId(
       public Builder mergeMessageId(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (messageIdBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              messageId_ != null &&
-              messageId_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
-            messageId_ =
-              org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(messageId_).mergeFrom(value).buildPartial();
+            messageId_ != null &&
+            messageId_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
+            getMessageIdBuilder().mergeFrom(value);
           } else {
             messageId_ = value;
           }
-          onChanged();
         } else {
           messageIdBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (messageId_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Payload messageId = 1;
        */
       public Builder clearMessageId() {
-        if (messageIdBuilder_ == null) {
-          messageId_ = null;
-          onChanged();
-        } else {
-          messageIdBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        messageId_ = null;
+        if (messageIdBuilder_ != null) {
+          messageIdBuilder_.dispose();
+          messageIdBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -2711,7 +2667,18 @@ public Identify parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Identify(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -2768,7 +2735,7 @@ public interface ActorIdentityOrBuilder extends
   /**
    * Protobuf type {@code ActorIdentity}
    */
-  public  static final class ActorIdentity extends
+  public static final class ActorIdentity extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ActorIdentity)
       ActorIdentityOrBuilder {
@@ -2787,75 +2754,6 @@ protected java.lang.Object newInstance(
       return new ActorIdentity();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ActorIdentity(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = correlationId_.toBuilder();
-              }
-              correlationId_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(correlationId_);
-                correlationId_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.remote.ContainerFormats.ActorRef.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = ref_.toBuilder();
-              }
-              ref_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.ActorRef.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(ref_);
-                ref_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ContainerFormats.internal_static_ActorIdentity_descriptor;
@@ -2876,6 +2774,7 @@ private ActorIdentity(
      * required .Payload correlationId = 1;
      * @return Whether the correlationId field is set.
      */
+    @java.lang.Override
     public boolean hasCorrelationId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -2883,12 +2782,14 @@ public boolean hasCorrelationId() {
      * required .Payload correlationId = 1;
      * @return The correlationId.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.Payload getCorrelationId() {
       return correlationId_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : correlationId_;
     }
     /**
      * required .Payload correlationId = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getCorrelationIdOrBuilder() {
       return correlationId_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : correlationId_;
     }
@@ -2899,6 +2800,7 @@ public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getCorrelationI
      * optional .ActorRef ref = 2;
      * @return Whether the ref field is set.
      */
+    @java.lang.Override
     public boolean hasRef() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -2906,12 +2808,14 @@ public boolean hasRef() {
      * optional .ActorRef ref = 2;
      * @return The ref.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.ActorRef getRef() {
       return ref_ == null ? org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance() : ref_;
     }
     /**
      * optional .ActorRef ref = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.ActorRefOrBuilder getRefOrBuilder() {
       return ref_ == null ? org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance() : ref_;
     }
@@ -2950,7 +2854,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getRef());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -2967,7 +2871,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getRef());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2992,7 +2896,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getRef()
             .equals(other.getRef())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -3011,7 +2915,7 @@ public int hashCode() {
         hash = (37 * hash) + REF_FIELD_NUMBER;
         hash = (53 * hash) + getRef().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3060,11 +2964,13 @@ public static org.apache.pekko.remote.ContainerFormats.ActorIdentity parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.ActorIdentity parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.ActorIdentity parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -3146,18 +3052,17 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (correlationIdBuilder_ == null) {
-          correlationId_ = null;
-        } else {
-          correlationIdBuilder_.clear();
+        bitField0_ = 0;
+        correlationId_ = null;
+        if (correlationIdBuilder_ != null) {
+          correlationIdBuilder_.dispose();
+          correlationIdBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (refBuilder_ == null) {
-          ref_ = null;
-        } else {
-          refBuilder_.clear();
+        ref_ = null;
+        if (refBuilder_ != null) {
+          refBuilder_.dispose();
+          refBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -3184,27 +3089,27 @@ public org.apache.pekko.remote.ContainerFormats.ActorIdentity build() {
       @java.lang.Override
       public org.apache.pekko.remote.ContainerFormats.ActorIdentity buildPartial() {
         org.apache.pekko.remote.ContainerFormats.ActorIdentity result = new org.apache.pekko.remote.ContainerFormats.ActorIdentity(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ContainerFormats.ActorIdentity result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (correlationIdBuilder_ == null) {
-            result.correlationId_ = correlationId_;
-          } else {
-            result.correlationId_ = correlationIdBuilder_.build();
-          }
+          result.correlationId_ = correlationIdBuilder_ == null
+              ? correlationId_
+              : correlationIdBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (refBuilder_ == null) {
-            result.ref_ = ref_;
-          } else {
-            result.ref_ = refBuilder_.build();
-          }
+          result.ref_ = refBuilder_ == null
+              ? ref_
+              : refBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -3257,7 +3162,7 @@ public Builder mergeFrom(org.apache.pekko.remote.ContainerFormats.ActorIdentity
         if (other.hasRef()) {
           mergeRef(other.getRef());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -3283,17 +3188,44 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ContainerFormats.ActorIdentity parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getCorrelationIdFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getRefFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ContainerFormats.ActorIdentity) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -3328,11 +3260,11 @@ public Builder setCorrelationId(org.apache.pekko.remote.ContainerFormats.Payload
             throw new NullPointerException();
           }
           correlationId_ = value;
-          onChanged();
         } else {
           correlationIdBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -3342,11 +3274,11 @@ public Builder setCorrelationId(
           org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (correlationIdBuilder_ == null) {
           correlationId_ = builderForValue.build();
-          onChanged();
         } else {
           correlationIdBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -3355,31 +3287,32 @@ public Builder setCorrelationId(
       public Builder mergeCorrelationId(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (correlationIdBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              correlationId_ != null &&
-              correlationId_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
-            correlationId_ =
-              org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(correlationId_).mergeFrom(value).buildPartial();
+            correlationId_ != null &&
+            correlationId_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
+            getCorrelationIdBuilder().mergeFrom(value);
           } else {
             correlationId_ = value;
           }
-          onChanged();
         } else {
           correlationIdBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (correlationId_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Payload correlationId = 1;
        */
       public Builder clearCorrelationId() {
-        if (correlationIdBuilder_ == null) {
-          correlationId_ = null;
-          onChanged();
-        } else {
-          correlationIdBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        correlationId_ = null;
+        if (correlationIdBuilder_ != null) {
+          correlationIdBuilder_.dispose();
+          correlationIdBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -3448,11 +3381,11 @@ public Builder setRef(org.apache.pekko.remote.ContainerFormats.ActorRef value) {
             throw new NullPointerException();
           }
           ref_ = value;
-          onChanged();
         } else {
           refBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -3462,11 +3395,11 @@ public Builder setRef(
           org.apache.pekko.remote.ContainerFormats.ActorRef.Builder builderForValue) {
         if (refBuilder_ == null) {
           ref_ = builderForValue.build();
-          onChanged();
         } else {
           refBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -3475,31 +3408,32 @@ public Builder setRef(
       public Builder mergeRef(org.apache.pekko.remote.ContainerFormats.ActorRef value) {
         if (refBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              ref_ != null &&
-              ref_ != org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance()) {
-            ref_ =
-              org.apache.pekko.remote.ContainerFormats.ActorRef.newBuilder(ref_).mergeFrom(value).buildPartial();
+            ref_ != null &&
+            ref_ != org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance()) {
+            getRefBuilder().mergeFrom(value);
           } else {
             ref_ = value;
           }
-          onChanged();
         } else {
           refBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (ref_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .ActorRef ref = 2;
        */
       public Builder clearRef() {
-        if (refBuilder_ == null) {
-          ref_ = null;
-          onChanged();
-        } else {
-          refBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        ref_ = null;
+        if (refBuilder_ != null) {
+          refBuilder_.dispose();
+          refBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -3570,7 +3504,18 @@ public ActorIdentity parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ActorIdentity(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -3614,7 +3559,7 @@ public interface ActorRefOrBuilder extends
   /**
    * Protobuf type {@code ActorRef}
    */
-  public  static final class ActorRef extends
+  public static final class ActorRef extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ActorRef)
       ActorRefOrBuilder {
@@ -3634,55 +3579,6 @@ protected java.lang.Object newInstance(
       return new ActorRef();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ActorRef(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              path_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ContainerFormats.internal_static_ActorRef_descriptor;
@@ -3698,11 +3594,13 @@ private ActorRef(
 
     private int bitField0_;
     public static final int PATH_FIELD_NUMBER = 1;
-    private volatile java.lang.Object path_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object path_ = "";
     /**
      * required string path = 1;
      * @return Whether the path field is set.
      */
+    @java.lang.Override
     public boolean hasPath() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -3710,6 +3608,7 @@ public boolean hasPath() {
      * required string path = 1;
      * @return The path.
      */
+    @java.lang.Override
     public java.lang.String getPath() {
       java.lang.Object ref = path_;
       if (ref instanceof java.lang.String) {
@@ -3728,6 +3627,7 @@ public java.lang.String getPath() {
      * required string path = 1;
      * @return The bytes for path.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getPathBytes() {
       java.lang.Object ref = path_;
@@ -3763,7 +3663,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, path_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -3775,7 +3675,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000001) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, path_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -3795,7 +3695,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getPath()
             .equals(other.getPath())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -3810,7 +3710,7 @@ public int hashCode() {
         hash = (37 * hash) + PATH_FIELD_NUMBER;
         hash = (53 * hash) + getPath().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3859,11 +3759,13 @@ public static org.apache.pekko.remote.ContainerFormats.ActorRef parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.ActorRef parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.ActorRef parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -3927,24 +3829,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.ContainerFormats.ActorRef.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         path_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -3971,15 +3868,19 @@ public org.apache.pekko.remote.ContainerFormats.ActorRef build() {
       @java.lang.Override
       public org.apache.pekko.remote.ContainerFormats.ActorRef buildPartial() {
         org.apache.pekko.remote.ContainerFormats.ActorRef result = new org.apache.pekko.remote.ContainerFormats.ActorRef(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ContainerFormats.ActorRef result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.path_ = path_;
           to_bitField0_ |= 0x00000001;
         }
-        result.path_ = path_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -4027,11 +3928,11 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.remote.ContainerFormats.ActorRef other) {
         if (other == org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance()) return this;
         if (other.hasPath()) {
-          bitField0_ |= 0x00000001;
           path_ = other.path_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -4049,17 +3950,35 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ContainerFormats.ActorRef parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                path_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ContainerFormats.ActorRef) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -4114,11 +4033,9 @@ public java.lang.String getPath() {
        */
       public Builder setPath(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         path_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4127,8 +4044,8 @@ public Builder setPath(
        * @return This builder for chaining.
        */
       public Builder clearPath() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         path_ = getDefaultInstance().getPath();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -4139,11 +4056,9 @@ public Builder clearPath() {
        */
       public Builder setPathBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         path_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4180,7 +4095,18 @@ public ActorRef parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ActorRef(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -4222,7 +4148,7 @@ public interface OptionOrBuilder extends
   /**
    * Protobuf type {@code Option}
    */
-  public  static final class Option extends
+  public static final class Option extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Option)
       OptionOrBuilder {
@@ -4241,62 +4167,6 @@ protected java.lang.Object newInstance(
       return new Option();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Option(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = value_.toBuilder();
-              }
-              value_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(value_);
-                value_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ContainerFormats.internal_static_Option_descriptor;
@@ -4317,6 +4187,7 @@ private Option(
      * optional .Payload value = 1;
      * @return Whether the value field is set.
      */
+    @java.lang.Override
     public boolean hasValue() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -4324,12 +4195,14 @@ public boolean hasValue() {
      * optional .Payload value = 1;
      * @return The value.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.Payload getValue() {
       return value_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : value_;
     }
     /**
      * optional .Payload value = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getValueOrBuilder() {
       return value_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : value_;
     }
@@ -4357,7 +4230,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getValue());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -4370,7 +4243,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getValue());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4390,7 +4263,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getValue()
             .equals(other.getValue())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -4405,7 +4278,7 @@ public int hashCode() {
         hash = (37 * hash) + VALUE_FIELD_NUMBER;
         hash = (53 * hash) + getValue().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4454,11 +4327,13 @@ public static org.apache.pekko.remote.ContainerFormats.Option parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.Option parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.Option parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -4539,12 +4414,12 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (valueBuilder_ == null) {
-          value_ = null;
-        } else {
-          valueBuilder_.clear();
+        bitField0_ = 0;
+        value_ = null;
+        if (valueBuilder_ != null) {
+          valueBuilder_.dispose();
+          valueBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -4571,19 +4446,21 @@ public org.apache.pekko.remote.ContainerFormats.Option build() {
       @java.lang.Override
       public org.apache.pekko.remote.ContainerFormats.Option buildPartial() {
         org.apache.pekko.remote.ContainerFormats.Option result = new org.apache.pekko.remote.ContainerFormats.Option(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ContainerFormats.Option result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (valueBuilder_ == null) {
-            result.value_ = value_;
-          } else {
-            result.value_ = valueBuilder_.build();
-          }
+          result.value_ = valueBuilder_ == null
+              ? value_
+              : valueBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -4633,7 +4510,7 @@ public Builder mergeFrom(org.apache.pekko.remote.ContainerFormats.Option other)
         if (other.hasValue()) {
           mergeValue(other.getValue());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -4653,17 +4530,37 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ContainerFormats.Option parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getValueFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ContainerFormats.Option) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -4698,11 +4595,11 @@ public Builder setValue(org.apache.pekko.remote.ContainerFormats.Payload value)
             throw new NullPointerException();
           }
           value_ = value;
-          onChanged();
         } else {
           valueBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -4712,11 +4609,11 @@ public Builder setValue(
           org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (valueBuilder_ == null) {
           value_ = builderForValue.build();
-          onChanged();
         } else {
           valueBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -4725,31 +4622,32 @@ public Builder setValue(
       public Builder mergeValue(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (valueBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              value_ != null &&
-              value_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
-            value_ =
-              org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(value_).mergeFrom(value).buildPartial();
+            value_ != null &&
+            value_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
+            getValueBuilder().mergeFrom(value);
           } else {
             value_ = value;
           }
-          onChanged();
         } else {
           valueBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (value_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .Payload value = 1;
        */
       public Builder clearValue() {
-        if (valueBuilder_ == null) {
-          value_ = null;
-          onChanged();
-        } else {
-          valueBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        value_ = null;
+        if (valueBuilder_ != null) {
+          valueBuilder_.dispose();
+          valueBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -4820,7 +4718,18 @@ public Option parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Option(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -4880,7 +4789,7 @@ public interface PayloadOrBuilder extends
   /**
    * Protobuf type {@code Payload}
    */
-  public  static final class Payload extends
+  public static final class Payload extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Payload)
       PayloadOrBuilder {
@@ -4901,64 +4810,6 @@ protected java.lang.Object newInstance(
       return new Payload();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Payload(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              bitField0_ |= 0x00000001;
-              enclosedMessage_ = input.readBytes();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              serializerId_ = input.readInt32();
-              break;
-            }
-            case 34: {
-              bitField0_ |= 0x00000004;
-              messageManifest_ = input.readBytes();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ContainerFormats.internal_static_Payload_descriptor;
@@ -4974,11 +4825,12 @@ private Payload(
 
     private int bitField0_;
     public static final int ENCLOSEDMESSAGE_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.ByteString enclosedMessage_;
+    private org.apache.pekko.protobufv3.internal.ByteString enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * required bytes enclosedMessage = 1;
      * @return Whether the enclosedMessage field is set.
      */
+    @java.lang.Override
     public boolean hasEnclosedMessage() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -4986,16 +4838,18 @@ public boolean hasEnclosedMessage() {
      * required bytes enclosedMessage = 1;
      * @return The enclosedMessage.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
       return enclosedMessage_;
     }
 
     public static final int SERIALIZERID_FIELD_NUMBER = 2;
-    private int serializerId_;
+    private int serializerId_ = 0;
     /**
      * required int32 serializerId = 2;
      * @return Whether the serializerId field is set.
      */
+    @java.lang.Override
     public boolean hasSerializerId() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -5003,16 +4857,18 @@ public boolean hasSerializerId() {
      * required int32 serializerId = 2;
      * @return The serializerId.
      */
+    @java.lang.Override
     public int getSerializerId() {
       return serializerId_;
     }
 
     public static final int MESSAGEMANIFEST_FIELD_NUMBER = 4;
-    private org.apache.pekko.protobufv3.internal.ByteString messageManifest_;
+    private org.apache.pekko.protobufv3.internal.ByteString messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * optional bytes messageManifest = 4;
      * @return Whether the messageManifest field is set.
      */
+    @java.lang.Override
     public boolean hasMessageManifest() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -5020,6 +4876,7 @@ public boolean hasMessageManifest() {
      * optional bytes messageManifest = 4;
      * @return The messageManifest.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
       return messageManifest_;
     }
@@ -5055,7 +4912,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeBytes(4, messageManifest_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -5076,7 +4933,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(4, messageManifest_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5106,7 +4963,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getMessageManifest()
             .equals(other.getMessageManifest())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -5129,7 +4986,7 @@ public int hashCode() {
         hash = (37 * hash) + MESSAGEMANIFEST_FIELD_NUMBER;
         hash = (53 * hash) + getMessageManifest().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -5178,11 +5035,13 @@ public static org.apache.pekko.remote.ContainerFormats.Payload parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.Payload parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.Payload parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -5246,28 +5105,21 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.ContainerFormats.Payload.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
         serializerId_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -5294,23 +5146,27 @@ public org.apache.pekko.remote.ContainerFormats.Payload build() {
       @java.lang.Override
       public org.apache.pekko.remote.ContainerFormats.Payload buildPartial() {
         org.apache.pekko.remote.ContainerFormats.Payload result = new org.apache.pekko.remote.ContainerFormats.Payload(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ContainerFormats.Payload result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.enclosedMessage_ = enclosedMessage_;
           to_bitField0_ |= 0x00000001;
         }
-        result.enclosedMessage_ = enclosedMessage_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.serializerId_ = serializerId_;
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.messageManifest_ = messageManifest_;
           to_bitField0_ |= 0x00000004;
         }
-        result.messageManifest_ = messageManifest_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -5366,7 +5222,7 @@ public Builder mergeFrom(org.apache.pekko.remote.ContainerFormats.Payload other)
         if (other.hasMessageManifest()) {
           setMessageManifest(other.getMessageManifest());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -5387,17 +5243,45 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ContainerFormats.Payload parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                enclosedMessage_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                serializerId_ = input.readInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 34: {
+                messageManifest_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 34
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ContainerFormats.Payload) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -5407,6 +5291,7 @@ public Builder mergeFrom(
        * required bytes enclosedMessage = 1;
        * @return Whether the enclosedMessage field is set.
        */
+      @java.lang.Override
       public boolean hasEnclosedMessage() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -5414,6 +5299,7 @@ public boolean hasEnclosedMessage() {
        * required bytes enclosedMessage = 1;
        * @return The enclosedMessage.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
         return enclosedMessage_;
       }
@@ -5423,11 +5309,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
        * @return This builder for chaining.
        */
       public Builder setEnclosedMessage(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         enclosedMessage_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -5447,6 +5331,7 @@ public Builder clearEnclosedMessage() {
        * required int32 serializerId = 2;
        * @return Whether the serializerId field is set.
        */
+      @java.lang.Override
       public boolean hasSerializerId() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -5454,6 +5339,7 @@ public boolean hasSerializerId() {
        * required int32 serializerId = 2;
        * @return The serializerId.
        */
+      @java.lang.Override
       public int getSerializerId() {
         return serializerId_;
       }
@@ -5463,8 +5349,9 @@ public int getSerializerId() {
        * @return This builder for chaining.
        */
       public Builder setSerializerId(int value) {
-        bitField0_ |= 0x00000002;
+
         serializerId_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -5484,6 +5371,7 @@ public Builder clearSerializerId() {
        * optional bytes messageManifest = 4;
        * @return Whether the messageManifest field is set.
        */
+      @java.lang.Override
       public boolean hasMessageManifest() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -5491,6 +5379,7 @@ public boolean hasMessageManifest() {
        * optional bytes messageManifest = 4;
        * @return The messageManifest.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
         return messageManifest_;
       }
@@ -5500,11 +5389,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
        * @return This builder for chaining.
        */
       public Builder setMessageManifest(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         messageManifest_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -5551,7 +5438,18 @@ public Payload parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Payload(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -5589,7 +5487,7 @@ public interface WatcherHeartbeatResponseOrBuilder extends
   /**
    * Protobuf type {@code WatcherHeartbeatResponse}
    */
-  public  static final class WatcherHeartbeatResponse extends
+  public static final class WatcherHeartbeatResponse extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:WatcherHeartbeatResponse)
       WatcherHeartbeatResponseOrBuilder {
@@ -5608,54 +5506,6 @@ protected java.lang.Object newInstance(
       return new WatcherHeartbeatResponse();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private WatcherHeartbeatResponse(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              uid_ = input.readUInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ContainerFormats.internal_static_WatcherHeartbeatResponse_descriptor;
@@ -5671,11 +5521,12 @@ private WatcherHeartbeatResponse(
 
     private int bitField0_;
     public static final int UID_FIELD_NUMBER = 1;
-    private long uid_;
+    private long uid_ = 0L;
     /**
      * required uint64 uid = 1;
      * @return Whether the uid field is set.
      */
+    @java.lang.Override
     public boolean hasUid() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -5683,6 +5534,7 @@ public boolean hasUid() {
      * required uint64 uid = 1;
      * @return The uid.
      */
+    @java.lang.Override
     public long getUid() {
       return uid_;
     }
@@ -5708,7 +5560,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeUInt64(1, uid_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -5721,7 +5573,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt64Size(1, uid_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5741,7 +5593,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getUid()
             != other.getUid()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -5757,7 +5609,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getUid());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -5806,11 +5658,13 @@ public static org.apache.pekko.remote.ContainerFormats.WatcherHeartbeatResponse
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.WatcherHeartbeatResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.WatcherHeartbeatResponse parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -5874,24 +5728,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.ContainerFormats.WatcherHeartbeatResponse.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         uid_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -5918,15 +5767,19 @@ public org.apache.pekko.remote.ContainerFormats.WatcherHeartbeatResponse build()
       @java.lang.Override
       public org.apache.pekko.remote.ContainerFormats.WatcherHeartbeatResponse buildPartial() {
         org.apache.pekko.remote.ContainerFormats.WatcherHeartbeatResponse result = new org.apache.pekko.remote.ContainerFormats.WatcherHeartbeatResponse(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ContainerFormats.WatcherHeartbeatResponse result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.uid_ = uid_;
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -5976,7 +5829,7 @@ public Builder mergeFrom(org.apache.pekko.remote.ContainerFormats.WatcherHeartbe
         if (other.hasUid()) {
           setUid(other.getUid());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -5994,17 +5847,35 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ContainerFormats.WatcherHeartbeatResponse parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                uid_ = input.readUInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ContainerFormats.WatcherHeartbeatResponse) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -6014,6 +5885,7 @@ public Builder mergeFrom(
        * required uint64 uid = 1;
        * @return Whether the uid field is set.
        */
+      @java.lang.Override
       public boolean hasUid() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -6021,6 +5893,7 @@ public boolean hasUid() {
        * required uint64 uid = 1;
        * @return The uid.
        */
+      @java.lang.Override
       public long getUid() {
         return uid_;
       }
@@ -6030,8 +5903,9 @@ public long getUid() {
        * @return This builder for chaining.
        */
       public Builder setUid(long value) {
-        bitField0_ |= 0x00000001;
+
         uid_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -6078,7 +5952,18 @@ public WatcherHeartbeatResponse parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new WatcherHeartbeatResponse(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -6178,7 +6063,7 @@ org.apache.pekko.remote.ContainerFormats.StackTraceElementOrBuilder getStackTrac
   /**
    * Protobuf type {@code Throwable}
    */
-  public  static final class Throwable extends
+  public static final class Throwable extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Throwable)
       ThrowableOrBuilder {
@@ -6200,86 +6085,6 @@ protected java.lang.Object newInstance(
       return new Throwable();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Throwable(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              className_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              message_ = bs;
-              break;
-            }
-            case 26: {
-              org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000004) != 0)) {
-                subBuilder = cause_.toBuilder();
-              }
-              cause_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(cause_);
-                cause_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000004;
-              break;
-            }
-            case 34: {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                stackTrace_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              stackTrace_.add(
-                  input.readMessage(org.apache.pekko.remote.ContainerFormats.StackTraceElement.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000008) != 0)) {
-          stackTrace_ = java.util.Collections.unmodifiableList(stackTrace_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ContainerFormats.internal_static_Throwable_descriptor;
@@ -6295,11 +6100,13 @@ private Throwable(
 
     private int bitField0_;
     public static final int CLASSNAME_FIELD_NUMBER = 1;
-    private volatile java.lang.Object className_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object className_ = "";
     /**
      * required string className = 1;
      * @return Whether the className field is set.
      */
+    @java.lang.Override
     public boolean hasClassName() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -6307,6 +6114,7 @@ public boolean hasClassName() {
      * required string className = 1;
      * @return The className.
      */
+    @java.lang.Override
     public java.lang.String getClassName() {
       java.lang.Object ref = className_;
       if (ref instanceof java.lang.String) {
@@ -6325,6 +6133,7 @@ public java.lang.String getClassName() {
      * required string className = 1;
      * @return The bytes for className.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getClassNameBytes() {
       java.lang.Object ref = className_;
@@ -6340,11 +6149,13 @@ public java.lang.String getClassName() {
     }
 
     public static final int MESSAGE_FIELD_NUMBER = 2;
-    private volatile java.lang.Object message_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object message_ = "";
     /**
      * optional string message = 2;
      * @return Whether the message field is set.
      */
+    @java.lang.Override
     public boolean hasMessage() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -6352,6 +6163,7 @@ public boolean hasMessage() {
      * optional string message = 2;
      * @return The message.
      */
+    @java.lang.Override
     public java.lang.String getMessage() {
       java.lang.Object ref = message_;
       if (ref instanceof java.lang.String) {
@@ -6370,6 +6182,7 @@ public java.lang.String getMessage() {
      * optional string message = 2;
      * @return The bytes for message.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getMessageBytes() {
       java.lang.Object ref = message_;
@@ -6390,6 +6203,7 @@ public java.lang.String getMessage() {
      * optional .Payload cause = 3;
      * @return Whether the cause field is set.
      */
+    @java.lang.Override
     public boolean hasCause() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -6397,27 +6211,32 @@ public boolean hasCause() {
      * optional .Payload cause = 3;
      * @return The cause.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.Payload getCause() {
       return cause_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : cause_;
     }
     /**
      * optional .Payload cause = 3;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getCauseOrBuilder() {
       return cause_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : cause_;
     }
 
     public static final int STACKTRACE_FIELD_NUMBER = 4;
+    @SuppressWarnings("serial")
     private java.util.List stackTrace_;
     /**
      * repeated .StackTraceElement stackTrace = 4;
      */
+    @java.lang.Override
     public java.util.List getStackTraceList() {
       return stackTrace_;
     }
     /**
      * repeated .StackTraceElement stackTrace = 4;
      */
+    @java.lang.Override
     public java.util.List 
         getStackTraceOrBuilderList() {
       return stackTrace_;
@@ -6425,18 +6244,21 @@ public java.util.Listrepeated .StackTraceElement stackTrace = 4;
      */
+    @java.lang.Override
     public int getStackTraceCount() {
       return stackTrace_.size();
     }
     /**
      * repeated .StackTraceElement stackTrace = 4;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.StackTraceElement getStackTrace(int index) {
       return stackTrace_.get(index);
     }
     /**
      * repeated .StackTraceElement stackTrace = 4;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.StackTraceElementOrBuilder getStackTraceOrBuilder(
         int index) {
       return stackTrace_.get(index);
@@ -6484,7 +6306,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < stackTrace_.size(); i++) {
         output.writeMessage(4, stackTrace_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -6507,7 +6329,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(4, stackTrace_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -6539,7 +6361,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getStackTraceList()
           .equals(other.getStackTraceList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -6566,7 +6388,7 @@ public int hashCode() {
         hash = (37 * hash) + STACKTRACE_FIELD_NUMBER;
         hash = (53 * hash) + getStackTraceList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -6615,11 +6437,13 @@ public static org.apache.pekko.remote.ContainerFormats.Throwable parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.Throwable parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.Throwable parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -6701,22 +6525,21 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         className_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         message_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
-        if (causeBuilder_ == null) {
-          cause_ = null;
-        } else {
-          causeBuilder_.clear();
+        cause_ = null;
+        if (causeBuilder_ != null) {
+          causeBuilder_.dispose();
+          causeBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000004);
         if (stackTraceBuilder_ == null) {
           stackTrace_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
+          stackTrace_ = null;
           stackTraceBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -6743,36 +6566,42 @@ public org.apache.pekko.remote.ContainerFormats.Throwable build() {
       @java.lang.Override
       public org.apache.pekko.remote.ContainerFormats.Throwable buildPartial() {
         org.apache.pekko.remote.ContainerFormats.Throwable result = new org.apache.pekko.remote.ContainerFormats.Throwable(this);
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.remote.ContainerFormats.Throwable result) {
+        if (stackTraceBuilder_ == null) {
+          if (((bitField0_ & 0x00000008) != 0)) {
+            stackTrace_ = java.util.Collections.unmodifiableList(stackTrace_);
+            bitField0_ = (bitField0_ & ~0x00000008);
+          }
+          result.stackTrace_ = stackTrace_;
+        } else {
+          result.stackTrace_ = stackTraceBuilder_.build();
+        }
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ContainerFormats.Throwable result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.className_ = className_;
           to_bitField0_ |= 0x00000001;
         }
-        result.className_ = className_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.message_ = message_;
           to_bitField0_ |= 0x00000002;
         }
-        result.message_ = message_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
-          if (causeBuilder_ == null) {
-            result.cause_ = cause_;
-          } else {
-            result.cause_ = causeBuilder_.build();
-          }
+          result.cause_ = causeBuilder_ == null
+              ? cause_
+              : causeBuilder_.build();
           to_bitField0_ |= 0x00000004;
         }
-        if (stackTraceBuilder_ == null) {
-          if (((bitField0_ & 0x00000008) != 0)) {
-            stackTrace_ = java.util.Collections.unmodifiableList(stackTrace_);
-            bitField0_ = (bitField0_ & ~0x00000008);
-          }
-          result.stackTrace_ = stackTrace_;
-        } else {
-          result.stackTrace_ = stackTraceBuilder_.build();
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -6820,13 +6649,13 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.remote.ContainerFormats.Throwable other) {
         if (other == org.apache.pekko.remote.ContainerFormats.Throwable.getDefaultInstance()) return this;
         if (other.hasClassName()) {
-          bitField0_ |= 0x00000001;
           className_ = other.className_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasMessage()) {
-          bitField0_ |= 0x00000002;
           message_ = other.message_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasCause()) {
@@ -6858,7 +6687,7 @@ public Builder mergeFrom(org.apache.pekko.remote.ContainerFormats.Throwable othe
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -6886,17 +6715,60 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ContainerFormats.Throwable parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                className_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                message_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 26: {
+                input.readMessage(
+                    getCauseFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              case 34: {
+                org.apache.pekko.remote.ContainerFormats.StackTraceElement m =
+                    input.readMessage(
+                        org.apache.pekko.remote.ContainerFormats.StackTraceElement.PARSER,
+                        extensionRegistry);
+                if (stackTraceBuilder_ == null) {
+                  ensureStackTraceIsMutable();
+                  stackTrace_.add(m);
+                } else {
+                  stackTraceBuilder_.addMessage(m);
+                }
+                break;
+              } // case 34
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ContainerFormats.Throwable) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -6951,11 +6823,9 @@ public java.lang.String getClassName() {
        */
       public Builder setClassName(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         className_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -6964,8 +6834,8 @@ public Builder setClassName(
        * @return This builder for chaining.
        */
       public Builder clearClassName() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         className_ = getDefaultInstance().getClassName();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -6976,11 +6846,9 @@ public Builder clearClassName() {
        */
       public Builder setClassNameBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         className_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -7035,11 +6903,9 @@ public java.lang.String getMessage() {
        */
       public Builder setMessage(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         message_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -7048,8 +6914,8 @@ public Builder setMessage(
        * @return This builder for chaining.
        */
       public Builder clearMessage() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         message_ = getDefaultInstance().getMessage();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -7060,11 +6926,9 @@ public Builder clearMessage() {
        */
       public Builder setMessageBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         message_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -7099,11 +6963,11 @@ public Builder setCause(org.apache.pekko.remote.ContainerFormats.Payload value)
             throw new NullPointerException();
           }
           cause_ = value;
-          onChanged();
         } else {
           causeBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -7113,11 +6977,11 @@ public Builder setCause(
           org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (causeBuilder_ == null) {
           cause_ = builderForValue.build();
-          onChanged();
         } else {
           causeBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -7126,31 +6990,32 @@ public Builder setCause(
       public Builder mergeCause(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (causeBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
-              cause_ != null &&
-              cause_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
-            cause_ =
-              org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(cause_).mergeFrom(value).buildPartial();
+            cause_ != null &&
+            cause_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
+            getCauseBuilder().mergeFrom(value);
           } else {
             cause_ = value;
           }
-          onChanged();
         } else {
           causeBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000004;
+        if (cause_ != null) {
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .Payload cause = 3;
        */
       public Builder clearCause() {
-        if (causeBuilder_ == null) {
-          cause_ = null;
-          onChanged();
-        } else {
-          causeBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000004);
+        cause_ = null;
+        if (causeBuilder_ != null) {
+          causeBuilder_.dispose();
+          causeBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -7461,7 +7326,18 @@ public Throwable parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Throwable(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -7539,7 +7415,7 @@ public interface ThrowableNotSerializableOrBuilder extends
   /**
    * Protobuf type {@code ThrowableNotSerializable}
    */
-  public  static final class ThrowableNotSerializable extends
+  public static final class ThrowableNotSerializable extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ThrowableNotSerializable)
       ThrowableNotSerializableOrBuilder {
@@ -7561,67 +7437,6 @@ protected java.lang.Object newInstance(
       return new ThrowableNotSerializable();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ThrowableNotSerializable(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              message_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              originalMessage_ = bs;
-              break;
-            }
-            case 26: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000004;
-              originalClassName_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ContainerFormats.internal_static_ThrowableNotSerializable_descriptor;
@@ -7637,11 +7452,13 @@ private ThrowableNotSerializable(
 
     private int bitField0_;
     public static final int MESSAGE_FIELD_NUMBER = 1;
-    private volatile java.lang.Object message_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object message_ = "";
     /**
      * required string message = 1;
      * @return Whether the message field is set.
      */
+    @java.lang.Override
     public boolean hasMessage() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -7649,6 +7466,7 @@ public boolean hasMessage() {
      * required string message = 1;
      * @return The message.
      */
+    @java.lang.Override
     public java.lang.String getMessage() {
       java.lang.Object ref = message_;
       if (ref instanceof java.lang.String) {
@@ -7667,6 +7485,7 @@ public java.lang.String getMessage() {
      * required string message = 1;
      * @return The bytes for message.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getMessageBytes() {
       java.lang.Object ref = message_;
@@ -7682,11 +7501,13 @@ public java.lang.String getMessage() {
     }
 
     public static final int ORIGINALMESSAGE_FIELD_NUMBER = 2;
-    private volatile java.lang.Object originalMessage_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object originalMessage_ = "";
     /**
      * required string originalMessage = 2;
      * @return Whether the originalMessage field is set.
      */
+    @java.lang.Override
     public boolean hasOriginalMessage() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -7694,6 +7515,7 @@ public boolean hasOriginalMessage() {
      * required string originalMessage = 2;
      * @return The originalMessage.
      */
+    @java.lang.Override
     public java.lang.String getOriginalMessage() {
       java.lang.Object ref = originalMessage_;
       if (ref instanceof java.lang.String) {
@@ -7712,6 +7534,7 @@ public java.lang.String getOriginalMessage() {
      * required string originalMessage = 2;
      * @return The bytes for originalMessage.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getOriginalMessageBytes() {
       java.lang.Object ref = originalMessage_;
@@ -7727,11 +7550,13 @@ public java.lang.String getOriginalMessage() {
     }
 
     public static final int ORIGINALCLASSNAME_FIELD_NUMBER = 3;
-    private volatile java.lang.Object originalClassName_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object originalClassName_ = "";
     /**
      * required string originalClassName = 3;
      * @return Whether the originalClassName field is set.
      */
+    @java.lang.Override
     public boolean hasOriginalClassName() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -7739,6 +7564,7 @@ public boolean hasOriginalClassName() {
      * required string originalClassName = 3;
      * @return The originalClassName.
      */
+    @java.lang.Override
     public java.lang.String getOriginalClassName() {
       java.lang.Object ref = originalClassName_;
       if (ref instanceof java.lang.String) {
@@ -7757,6 +7583,7 @@ public java.lang.String getOriginalClassName() {
      * required string originalClassName = 3;
      * @return The bytes for originalClassName.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getOriginalClassNameBytes() {
       java.lang.Object ref = originalClassName_;
@@ -7806,7 +7633,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, originalClassName_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -7824,7 +7651,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000004) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(3, originalClassName_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -7854,7 +7681,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getOriginalClassName()
             .equals(other.getOriginalClassName())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -7877,7 +7704,7 @@ public int hashCode() {
         hash = (37 * hash) + ORIGINALCLASSNAME_FIELD_NUMBER;
         hash = (53 * hash) + getOriginalClassName().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -7926,11 +7753,13 @@ public static org.apache.pekko.remote.ContainerFormats.ThrowableNotSerializable
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.ThrowableNotSerializable parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.ThrowableNotSerializable parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -7994,28 +7823,21 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.ContainerFormats.ThrowableNotSerializable.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         message_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         originalMessage_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         originalClassName_ = "";
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -8042,23 +7864,27 @@ public org.apache.pekko.remote.ContainerFormats.ThrowableNotSerializable build()
       @java.lang.Override
       public org.apache.pekko.remote.ContainerFormats.ThrowableNotSerializable buildPartial() {
         org.apache.pekko.remote.ContainerFormats.ThrowableNotSerializable result = new org.apache.pekko.remote.ContainerFormats.ThrowableNotSerializable(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ContainerFormats.ThrowableNotSerializable result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.message_ = message_;
           to_bitField0_ |= 0x00000001;
         }
-        result.message_ = message_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.originalMessage_ = originalMessage_;
           to_bitField0_ |= 0x00000002;
         }
-        result.originalMessage_ = originalMessage_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.originalClassName_ = originalClassName_;
           to_bitField0_ |= 0x00000004;
         }
-        result.originalClassName_ = originalClassName_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -8106,21 +7932,21 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.remote.ContainerFormats.ThrowableNotSerializable other) {
         if (other == org.apache.pekko.remote.ContainerFormats.ThrowableNotSerializable.getDefaultInstance()) return this;
         if (other.hasMessage()) {
-          bitField0_ |= 0x00000001;
           message_ = other.message_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasOriginalMessage()) {
-          bitField0_ |= 0x00000002;
           originalMessage_ = other.originalMessage_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasOriginalClassName()) {
-          bitField0_ |= 0x00000004;
           originalClassName_ = other.originalClassName_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -8144,17 +7970,45 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ContainerFormats.ThrowableNotSerializable parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                message_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                originalMessage_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 26: {
+                originalClassName_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ContainerFormats.ThrowableNotSerializable) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -8209,11 +8063,9 @@ public java.lang.String getMessage() {
        */
       public Builder setMessage(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         message_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8222,8 +8074,8 @@ public Builder setMessage(
        * @return This builder for chaining.
        */
       public Builder clearMessage() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         message_ = getDefaultInstance().getMessage();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -8234,11 +8086,9 @@ public Builder clearMessage() {
        */
       public Builder setMessageBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         message_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8293,11 +8143,9 @@ public java.lang.String getOriginalMessage() {
        */
       public Builder setOriginalMessage(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         originalMessage_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -8306,8 +8154,8 @@ public Builder setOriginalMessage(
        * @return This builder for chaining.
        */
       public Builder clearOriginalMessage() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         originalMessage_ = getDefaultInstance().getOriginalMessage();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -8318,11 +8166,9 @@ public Builder clearOriginalMessage() {
        */
       public Builder setOriginalMessageBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         originalMessage_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -8377,11 +8223,9 @@ public java.lang.String getOriginalClassName() {
        */
       public Builder setOriginalClassName(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         originalClassName_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -8390,8 +8234,8 @@ public Builder setOriginalClassName(
        * @return This builder for chaining.
        */
       public Builder clearOriginalClassName() {
-        bitField0_ = (bitField0_ & ~0x00000004);
         originalClassName_ = getDefaultInstance().getOriginalClassName();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -8402,11 +8246,9 @@ public Builder clearOriginalClassName() {
        */
       public Builder setOriginalClassNameBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         originalClassName_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -8443,7 +8285,18 @@ public ThrowableNotSerializable parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ThrowableNotSerializable(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -8517,7 +8370,7 @@ public interface ActorInitializationExceptionOrBuilder extends
   /**
    * Protobuf type {@code ActorInitializationException}
    */
-  public  static final class ActorInitializationException extends
+  public static final class ActorInitializationException extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ActorInitializationException)
       ActorInitializationExceptionOrBuilder {
@@ -8537,81 +8390,6 @@ protected java.lang.Object newInstance(
       return new ActorInitializationException();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ActorInitializationException(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.ContainerFormats.ActorRef.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = actor_.toBuilder();
-              }
-              actor_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.ActorRef.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(actor_);
-                actor_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              message_ = bs;
-              break;
-            }
-            case 26: {
-              org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000004) != 0)) {
-                subBuilder = cause_.toBuilder();
-              }
-              cause_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(cause_);
-                cause_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000004;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ContainerFormats.internal_static_ActorInitializationException_descriptor;
@@ -8632,6 +8410,7 @@ private ActorInitializationException(
      * optional .ActorRef actor = 1;
      * @return Whether the actor field is set.
      */
+    @java.lang.Override
     public boolean hasActor() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -8639,22 +8418,26 @@ public boolean hasActor() {
      * optional .ActorRef actor = 1;
      * @return The actor.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.ActorRef getActor() {
       return actor_ == null ? org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance() : actor_;
     }
     /**
      * optional .ActorRef actor = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.ActorRefOrBuilder getActorOrBuilder() {
       return actor_ == null ? org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance() : actor_;
     }
 
     public static final int MESSAGE_FIELD_NUMBER = 2;
-    private volatile java.lang.Object message_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object message_ = "";
     /**
      * required string message = 2;
      * @return Whether the message field is set.
      */
+    @java.lang.Override
     public boolean hasMessage() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -8662,6 +8445,7 @@ public boolean hasMessage() {
      * required string message = 2;
      * @return The message.
      */
+    @java.lang.Override
     public java.lang.String getMessage() {
       java.lang.Object ref = message_;
       if (ref instanceof java.lang.String) {
@@ -8680,6 +8464,7 @@ public java.lang.String getMessage() {
      * required string message = 2;
      * @return The bytes for message.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getMessageBytes() {
       java.lang.Object ref = message_;
@@ -8700,6 +8485,7 @@ public java.lang.String getMessage() {
      * required .Payload cause = 3;
      * @return Whether the cause field is set.
      */
+    @java.lang.Override
     public boolean hasCause() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -8707,12 +8493,14 @@ public boolean hasCause() {
      * required .Payload cause = 3;
      * @return The cause.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.Payload getCause() {
       return cause_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : cause_;
     }
     /**
      * required .Payload cause = 3;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getCauseOrBuilder() {
       return cause_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : cause_;
     }
@@ -8758,7 +8546,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeMessage(3, getCause());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -8778,7 +8566,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, getCause());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -8808,7 +8596,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getCause()
             .equals(other.getCause())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -8831,7 +8619,7 @@ public int hashCode() {
         hash = (37 * hash) + CAUSE_FIELD_NUMBER;
         hash = (53 * hash) + getCause().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -8880,11 +8668,13 @@ public static org.apache.pekko.remote.ContainerFormats.ActorInitializationExcept
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.ActorInitializationException parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.ActorInitializationException parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -8966,20 +8756,18 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (actorBuilder_ == null) {
-          actor_ = null;
-        } else {
-          actorBuilder_.clear();
+        bitField0_ = 0;
+        actor_ = null;
+        if (actorBuilder_ != null) {
+          actorBuilder_.dispose();
+          actorBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         message_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
-        if (causeBuilder_ == null) {
-          cause_ = null;
-        } else {
-          causeBuilder_.clear();
+        cause_ = null;
+        if (causeBuilder_ != null) {
+          causeBuilder_.dispose();
+          causeBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -9006,31 +8794,31 @@ public org.apache.pekko.remote.ContainerFormats.ActorInitializationException bui
       @java.lang.Override
       public org.apache.pekko.remote.ContainerFormats.ActorInitializationException buildPartial() {
         org.apache.pekko.remote.ContainerFormats.ActorInitializationException result = new org.apache.pekko.remote.ContainerFormats.ActorInitializationException(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ContainerFormats.ActorInitializationException result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (actorBuilder_ == null) {
-            result.actor_ = actor_;
-          } else {
-            result.actor_ = actorBuilder_.build();
-          }
+          result.actor_ = actorBuilder_ == null
+              ? actor_
+              : actorBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.message_ = message_;
           to_bitField0_ |= 0x00000002;
         }
-        result.message_ = message_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
-          if (causeBuilder_ == null) {
-            result.cause_ = cause_;
-          } else {
-            result.cause_ = causeBuilder_.build();
-          }
+          result.cause_ = causeBuilder_ == null
+              ? cause_
+              : causeBuilder_.build();
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -9081,14 +8869,14 @@ public Builder mergeFrom(org.apache.pekko.remote.ContainerFormats.ActorInitializ
           mergeActor(other.getActor());
         }
         if (other.hasMessage()) {
-          bitField0_ |= 0x00000002;
           message_ = other.message_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasCause()) {
           mergeCause(other.getCause());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -9117,17 +8905,49 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ContainerFormats.ActorInitializationException parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getActorFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                message_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 26: {
+                input.readMessage(
+                    getCauseFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ContainerFormats.ActorInitializationException) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -9162,11 +8982,11 @@ public Builder setActor(org.apache.pekko.remote.ContainerFormats.ActorRef value)
             throw new NullPointerException();
           }
           actor_ = value;
-          onChanged();
         } else {
           actorBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -9176,11 +8996,11 @@ public Builder setActor(
           org.apache.pekko.remote.ContainerFormats.ActorRef.Builder builderForValue) {
         if (actorBuilder_ == null) {
           actor_ = builderForValue.build();
-          onChanged();
         } else {
           actorBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -9189,31 +9009,32 @@ public Builder setActor(
       public Builder mergeActor(org.apache.pekko.remote.ContainerFormats.ActorRef value) {
         if (actorBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              actor_ != null &&
-              actor_ != org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance()) {
-            actor_ =
-              org.apache.pekko.remote.ContainerFormats.ActorRef.newBuilder(actor_).mergeFrom(value).buildPartial();
+            actor_ != null &&
+            actor_ != org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance()) {
+            getActorBuilder().mergeFrom(value);
           } else {
             actor_ = value;
           }
-          onChanged();
         } else {
           actorBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (actor_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .ActorRef actor = 1;
        */
       public Builder clearActor() {
-        if (actorBuilder_ == null) {
-          actor_ = null;
-          onChanged();
-        } else {
-          actorBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        actor_ = null;
+        if (actorBuilder_ != null) {
+          actorBuilder_.dispose();
+          actorBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -9302,11 +9123,9 @@ public java.lang.String getMessage() {
        */
       public Builder setMessage(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         message_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -9315,8 +9134,8 @@ public Builder setMessage(
        * @return This builder for chaining.
        */
       public Builder clearMessage() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         message_ = getDefaultInstance().getMessage();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -9327,11 +9146,9 @@ public Builder clearMessage() {
        */
       public Builder setMessageBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         message_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -9366,11 +9183,11 @@ public Builder setCause(org.apache.pekko.remote.ContainerFormats.Payload value)
             throw new NullPointerException();
           }
           cause_ = value;
-          onChanged();
         } else {
           causeBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -9380,11 +9197,11 @@ public Builder setCause(
           org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (causeBuilder_ == null) {
           cause_ = builderForValue.build();
-          onChanged();
         } else {
           causeBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -9393,31 +9210,32 @@ public Builder setCause(
       public Builder mergeCause(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (causeBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
-              cause_ != null &&
-              cause_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
-            cause_ =
-              org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(cause_).mergeFrom(value).buildPartial();
+            cause_ != null &&
+            cause_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
+            getCauseBuilder().mergeFrom(value);
           } else {
             cause_ = value;
           }
-          onChanged();
         } else {
           causeBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000004;
+        if (cause_ != null) {
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Payload cause = 3;
        */
       public Builder clearCause() {
-        if (causeBuilder_ == null) {
-          cause_ = null;
-          onChanged();
-        } else {
-          causeBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000004);
+        cause_ = null;
+        if (causeBuilder_ != null) {
+          causeBuilder_.dispose();
+          causeBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -9488,7 +9306,18 @@ public ActorInitializationException parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ActorInitializationException(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -9577,7 +9406,7 @@ public interface StackTraceElementOrBuilder extends
   /**
    * Protobuf type {@code StackTraceElement}
    */
-  public  static final class StackTraceElement extends
+  public static final class StackTraceElement extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:StackTraceElement)
       StackTraceElementOrBuilder {
@@ -9599,72 +9428,6 @@ protected java.lang.Object newInstance(
       return new StackTraceElement();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private StackTraceElement(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              className_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              methodName_ = bs;
-              break;
-            }
-            case 26: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000004;
-              fileName_ = bs;
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              lineNumber_ = input.readInt32();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ContainerFormats.internal_static_StackTraceElement_descriptor;
@@ -9680,11 +9443,13 @@ private StackTraceElement(
 
     private int bitField0_;
     public static final int CLASSNAME_FIELD_NUMBER = 1;
-    private volatile java.lang.Object className_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object className_ = "";
     /**
      * required string className = 1;
      * @return Whether the className field is set.
      */
+    @java.lang.Override
     public boolean hasClassName() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -9692,6 +9457,7 @@ public boolean hasClassName() {
      * required string className = 1;
      * @return The className.
      */
+    @java.lang.Override
     public java.lang.String getClassName() {
       java.lang.Object ref = className_;
       if (ref instanceof java.lang.String) {
@@ -9710,6 +9476,7 @@ public java.lang.String getClassName() {
      * required string className = 1;
      * @return The bytes for className.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getClassNameBytes() {
       java.lang.Object ref = className_;
@@ -9725,11 +9492,13 @@ public java.lang.String getClassName() {
     }
 
     public static final int METHODNAME_FIELD_NUMBER = 2;
-    private volatile java.lang.Object methodName_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object methodName_ = "";
     /**
      * required string methodName = 2;
      * @return Whether the methodName field is set.
      */
+    @java.lang.Override
     public boolean hasMethodName() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -9737,6 +9506,7 @@ public boolean hasMethodName() {
      * required string methodName = 2;
      * @return The methodName.
      */
+    @java.lang.Override
     public java.lang.String getMethodName() {
       java.lang.Object ref = methodName_;
       if (ref instanceof java.lang.String) {
@@ -9755,6 +9525,7 @@ public java.lang.String getMethodName() {
      * required string methodName = 2;
      * @return The bytes for methodName.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getMethodNameBytes() {
       java.lang.Object ref = methodName_;
@@ -9770,11 +9541,13 @@ public java.lang.String getMethodName() {
     }
 
     public static final int FILENAME_FIELD_NUMBER = 3;
-    private volatile java.lang.Object fileName_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object fileName_ = "";
     /**
      * required string fileName = 3;
      * @return Whether the fileName field is set.
      */
+    @java.lang.Override
     public boolean hasFileName() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -9782,6 +9555,7 @@ public boolean hasFileName() {
      * required string fileName = 3;
      * @return The fileName.
      */
+    @java.lang.Override
     public java.lang.String getFileName() {
       java.lang.Object ref = fileName_;
       if (ref instanceof java.lang.String) {
@@ -9800,6 +9574,7 @@ public java.lang.String getFileName() {
      * required string fileName = 3;
      * @return The bytes for fileName.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getFileNameBytes() {
       java.lang.Object ref = fileName_;
@@ -9815,11 +9590,12 @@ public java.lang.String getFileName() {
     }
 
     public static final int LINENUMBER_FIELD_NUMBER = 4;
-    private int lineNumber_;
+    private int lineNumber_ = 0;
     /**
      * required int32 lineNumber = 4;
      * @return Whether the lineNumber field is set.
      */
+    @java.lang.Override
     public boolean hasLineNumber() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -9827,6 +9603,7 @@ public boolean hasLineNumber() {
      * required int32 lineNumber = 4;
      * @return The lineNumber.
      */
+    @java.lang.Override
     public int getLineNumber() {
       return lineNumber_;
     }
@@ -9873,7 +9650,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeInt32(4, lineNumber_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -9895,7 +9672,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(4, lineNumber_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -9930,7 +9707,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getLineNumber()
             != other.getLineNumber()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -9957,7 +9734,7 @@ public int hashCode() {
         hash = (37 * hash) + LINENUMBER_FIELD_NUMBER;
         hash = (53 * hash) + getLineNumber();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -10006,11 +9783,13 @@ public static org.apache.pekko.remote.ContainerFormats.StackTraceElement parseFr
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.StackTraceElement parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.StackTraceElement parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -10074,30 +9853,22 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.ContainerFormats.StackTraceElement.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         className_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         methodName_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         fileName_ = "";
-        bitField0_ = (bitField0_ & ~0x00000004);
         lineNumber_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -10124,27 +9895,31 @@ public org.apache.pekko.remote.ContainerFormats.StackTraceElement build() {
       @java.lang.Override
       public org.apache.pekko.remote.ContainerFormats.StackTraceElement buildPartial() {
         org.apache.pekko.remote.ContainerFormats.StackTraceElement result = new org.apache.pekko.remote.ContainerFormats.StackTraceElement(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ContainerFormats.StackTraceElement result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.className_ = className_;
           to_bitField0_ |= 0x00000001;
         }
-        result.className_ = className_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.methodName_ = methodName_;
           to_bitField0_ |= 0x00000002;
         }
-        result.methodName_ = methodName_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.fileName_ = fileName_;
           to_bitField0_ |= 0x00000004;
         }
-        result.fileName_ = fileName_;
         if (((from_bitField0_ & 0x00000008) != 0)) {
           result.lineNumber_ = lineNumber_;
           to_bitField0_ |= 0x00000008;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -10192,24 +9967,24 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.remote.ContainerFormats.StackTraceElement other) {
         if (other == org.apache.pekko.remote.ContainerFormats.StackTraceElement.getDefaultInstance()) return this;
         if (other.hasClassName()) {
-          bitField0_ |= 0x00000001;
           className_ = other.className_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasMethodName()) {
-          bitField0_ |= 0x00000002;
           methodName_ = other.methodName_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasFileName()) {
-          bitField0_ |= 0x00000004;
           fileName_ = other.fileName_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
         if (other.hasLineNumber()) {
           setLineNumber(other.getLineNumber());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -10236,17 +10011,50 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ContainerFormats.StackTraceElement parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                className_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                methodName_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 26: {
+                fileName_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              case 32: {
+                lineNumber_ = input.readInt32();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ContainerFormats.StackTraceElement) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -10301,11 +10109,9 @@ public java.lang.String getClassName() {
        */
       public Builder setClassName(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         className_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -10314,8 +10120,8 @@ public Builder setClassName(
        * @return This builder for chaining.
        */
       public Builder clearClassName() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         className_ = getDefaultInstance().getClassName();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -10326,11 +10132,9 @@ public Builder clearClassName() {
        */
       public Builder setClassNameBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         className_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -10385,11 +10189,9 @@ public java.lang.String getMethodName() {
        */
       public Builder setMethodName(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         methodName_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -10398,8 +10200,8 @@ public Builder setMethodName(
        * @return This builder for chaining.
        */
       public Builder clearMethodName() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         methodName_ = getDefaultInstance().getMethodName();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -10410,11 +10212,9 @@ public Builder clearMethodName() {
        */
       public Builder setMethodNameBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         methodName_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -10469,11 +10269,9 @@ public java.lang.String getFileName() {
        */
       public Builder setFileName(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         fileName_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -10482,8 +10280,8 @@ public Builder setFileName(
        * @return This builder for chaining.
        */
       public Builder clearFileName() {
-        bitField0_ = (bitField0_ & ~0x00000004);
         fileName_ = getDefaultInstance().getFileName();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -10494,11 +10292,9 @@ public Builder clearFileName() {
        */
       public Builder setFileNameBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         fileName_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -10508,6 +10304,7 @@ public Builder setFileNameBytes(
        * required int32 lineNumber = 4;
        * @return Whether the lineNumber field is set.
        */
+      @java.lang.Override
       public boolean hasLineNumber() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -10515,6 +10312,7 @@ public boolean hasLineNumber() {
        * required int32 lineNumber = 4;
        * @return The lineNumber.
        */
+      @java.lang.Override
       public int getLineNumber() {
         return lineNumber_;
       }
@@ -10524,8 +10322,9 @@ public int getLineNumber() {
        * @return This builder for chaining.
        */
       public Builder setLineNumber(int value) {
-        bitField0_ |= 0x00000008;
+
         lineNumber_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -10572,7 +10371,18 @@ public StackTraceElement parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new StackTraceElement(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -10620,7 +10430,7 @@ public interface StatusReplyErrorMessageOrBuilder extends
    *
    * Protobuf type {@code StatusReplyErrorMessage}
    */
-  public  static final class StatusReplyErrorMessage extends
+  public static final class StatusReplyErrorMessage extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:StatusReplyErrorMessage)
       StatusReplyErrorMessageOrBuilder {
@@ -10640,55 +10450,6 @@ protected java.lang.Object newInstance(
       return new StatusReplyErrorMessage();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private StatusReplyErrorMessage(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              errorMessage_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ContainerFormats.internal_static_StatusReplyErrorMessage_descriptor;
@@ -10704,11 +10465,13 @@ private StatusReplyErrorMessage(
 
     private int bitField0_;
     public static final int ERRORMESSAGE_FIELD_NUMBER = 1;
-    private volatile java.lang.Object errorMessage_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object errorMessage_ = "";
     /**
      * required string errorMessage = 1;
      * @return Whether the errorMessage field is set.
      */
+    @java.lang.Override
     public boolean hasErrorMessage() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -10716,6 +10479,7 @@ public boolean hasErrorMessage() {
      * required string errorMessage = 1;
      * @return The errorMessage.
      */
+    @java.lang.Override
     public java.lang.String getErrorMessage() {
       java.lang.Object ref = errorMessage_;
       if (ref instanceof java.lang.String) {
@@ -10734,6 +10498,7 @@ public java.lang.String getErrorMessage() {
      * required string errorMessage = 1;
      * @return The bytes for errorMessage.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getErrorMessageBytes() {
       java.lang.Object ref = errorMessage_;
@@ -10769,7 +10534,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, errorMessage_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -10781,7 +10546,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000001) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, errorMessage_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -10801,7 +10566,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getErrorMessage()
             .equals(other.getErrorMessage())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -10816,7 +10581,7 @@ public int hashCode() {
         hash = (37 * hash) + ERRORMESSAGE_FIELD_NUMBER;
         hash = (53 * hash) + getErrorMessage().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -10865,11 +10630,13 @@ public static org.apache.pekko.remote.ContainerFormats.StatusReplyErrorMessage p
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.StatusReplyErrorMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ContainerFormats.StatusReplyErrorMessage parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -10937,24 +10704,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.ContainerFormats.StatusReplyErrorMessage.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         errorMessage_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -10981,15 +10743,19 @@ public org.apache.pekko.remote.ContainerFormats.StatusReplyErrorMessage build()
       @java.lang.Override
       public org.apache.pekko.remote.ContainerFormats.StatusReplyErrorMessage buildPartial() {
         org.apache.pekko.remote.ContainerFormats.StatusReplyErrorMessage result = new org.apache.pekko.remote.ContainerFormats.StatusReplyErrorMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ContainerFormats.StatusReplyErrorMessage result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.errorMessage_ = errorMessage_;
           to_bitField0_ |= 0x00000001;
         }
-        result.errorMessage_ = errorMessage_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -11037,11 +10803,11 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.remote.ContainerFormats.StatusReplyErrorMessage other) {
         if (other == org.apache.pekko.remote.ContainerFormats.StatusReplyErrorMessage.getDefaultInstance()) return this;
         if (other.hasErrorMessage()) {
-          bitField0_ |= 0x00000001;
           errorMessage_ = other.errorMessage_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -11059,17 +10825,35 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ContainerFormats.StatusReplyErrorMessage parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                errorMessage_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ContainerFormats.StatusReplyErrorMessage) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -11124,11 +10908,9 @@ public java.lang.String getErrorMessage() {
        */
       public Builder setErrorMessage(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         errorMessage_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -11137,8 +10919,8 @@ public Builder setErrorMessage(
        * @return This builder for chaining.
        */
       public Builder clearErrorMessage() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         errorMessage_ = getDefaultInstance().getErrorMessage();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -11149,11 +10931,9 @@ public Builder clearErrorMessage() {
        */
       public Builder setErrorMessageBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         errorMessage_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -11190,7 +10970,18 @@ public StatusReplyErrorMessage parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new StatusReplyErrorMessage(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
diff --git a/remote/src/main/java/org/apache/pekko/remote/SystemMessageFormats.java b/remote/src/main/java/org/apache/pekko/remote/SystemMessageFormats.java
index f5cc3ea7360..e3c016134fe 100644
--- a/remote/src/main/java/org/apache/pekko/remote/SystemMessageFormats.java
+++ b/remote/src/main/java/org/apache/pekko/remote/SystemMessageFormats.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2021-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: SystemMessageFormats.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.remote;
 
 public final class SystemMessageFormats {
@@ -120,7 +121,7 @@ public interface SystemMessageOrBuilder extends
   /**
    * Protobuf type {@code SystemMessage}
    */
-  public  static final class SystemMessage extends
+  public static final class SystemMessage extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:SystemMessage)
       SystemMessageOrBuilder {
@@ -140,126 +141,6 @@ protected java.lang.Object newInstance(
       return new SystemMessage();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private SystemMessage(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              int rawValue = input.readEnum();
-                @SuppressWarnings("deprecation")
-              org.apache.pekko.remote.SystemMessageFormats.SystemMessage.Type value = org.apache.pekko.remote.SystemMessageFormats.SystemMessage.Type.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(1, rawValue);
-              } else {
-                bitField0_ |= 0x00000001;
-                type_ = rawValue;
-              }
-              break;
-            }
-            case 18: {
-              org.apache.pekko.remote.SystemMessageFormats.WatchData.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = watchData_.toBuilder();
-              }
-              watchData_ = input.readMessage(org.apache.pekko.remote.SystemMessageFormats.WatchData.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(watchData_);
-                watchData_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            case 26: {
-              org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000004) != 0)) {
-                subBuilder = causeData_.toBuilder();
-              }
-              causeData_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(causeData_);
-                causeData_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000004;
-              break;
-            }
-            case 42: {
-              org.apache.pekko.remote.SystemMessageFormats.SuperviseData.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000008) != 0)) {
-                subBuilder = superviseData_.toBuilder();
-              }
-              superviseData_ = input.readMessage(org.apache.pekko.remote.SystemMessageFormats.SuperviseData.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(superviseData_);
-                superviseData_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000008;
-              break;
-            }
-            case 50: {
-              org.apache.pekko.remote.SystemMessageFormats.FailedData.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000010) != 0)) {
-                subBuilder = failedData_.toBuilder();
-              }
-              failedData_ = input.readMessage(org.apache.pekko.remote.SystemMessageFormats.FailedData.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(failedData_);
-                failedData_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000010;
-              break;
-            }
-            case 58: {
-              org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationData.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000020) != 0)) {
-                subBuilder = dwNotificationData_.toBuilder();
-              }
-              dwNotificationData_ = input.readMessage(org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationData.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(dwNotificationData_);
-                dwNotificationData_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000020;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.SystemMessageFormats.internal_static_SystemMessage_descriptor;
@@ -443,21 +324,20 @@ private Type(int value) {
 
     private int bitField0_;
     public static final int TYPE_FIELD_NUMBER = 1;
-    private int type_;
+    private int type_ = 0;
     /**
      * required .SystemMessage.Type type = 1;
      * @return Whether the type field is set.
      */
-    public boolean hasType() {
+    @java.lang.Override public boolean hasType() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      * required .SystemMessage.Type type = 1;
      * @return The type.
      */
-    public org.apache.pekko.remote.SystemMessageFormats.SystemMessage.Type getType() {
-      @SuppressWarnings("deprecation")
-      org.apache.pekko.remote.SystemMessageFormats.SystemMessage.Type result = org.apache.pekko.remote.SystemMessageFormats.SystemMessage.Type.valueOf(type_);
+    @java.lang.Override public org.apache.pekko.remote.SystemMessageFormats.SystemMessage.Type getType() {
+      org.apache.pekko.remote.SystemMessageFormats.SystemMessage.Type result = org.apache.pekko.remote.SystemMessageFormats.SystemMessage.Type.forNumber(type_);
       return result == null ? org.apache.pekko.remote.SystemMessageFormats.SystemMessage.Type.CREATE : result;
     }
 
@@ -467,6 +347,7 @@ public org.apache.pekko.remote.SystemMessageFormats.SystemMessage.Type getType()
      * optional .WatchData watchData = 2;
      * @return Whether the watchData field is set.
      */
+    @java.lang.Override
     public boolean hasWatchData() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -474,12 +355,14 @@ public boolean hasWatchData() {
      * optional .WatchData watchData = 2;
      * @return The watchData.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.SystemMessageFormats.WatchData getWatchData() {
       return watchData_ == null ? org.apache.pekko.remote.SystemMessageFormats.WatchData.getDefaultInstance() : watchData_;
     }
     /**
      * optional .WatchData watchData = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.SystemMessageFormats.WatchDataOrBuilder getWatchDataOrBuilder() {
       return watchData_ == null ? org.apache.pekko.remote.SystemMessageFormats.WatchData.getDefaultInstance() : watchData_;
     }
@@ -490,6 +373,7 @@ public org.apache.pekko.remote.SystemMessageFormats.WatchDataOrBuilder getWatchD
      * optional .Payload causeData = 3;
      * @return Whether the causeData field is set.
      */
+    @java.lang.Override
     public boolean hasCauseData() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -497,12 +381,14 @@ public boolean hasCauseData() {
      * optional .Payload causeData = 3;
      * @return The causeData.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.Payload getCauseData() {
       return causeData_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : causeData_;
     }
     /**
      * optional .Payload causeData = 3;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getCauseDataOrBuilder() {
       return causeData_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : causeData_;
     }
@@ -513,6 +399,7 @@ public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getCauseDataOrB
      * optional .SuperviseData superviseData = 5;
      * @return Whether the superviseData field is set.
      */
+    @java.lang.Override
     public boolean hasSuperviseData() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -520,12 +407,14 @@ public boolean hasSuperviseData() {
      * optional .SuperviseData superviseData = 5;
      * @return The superviseData.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.SystemMessageFormats.SuperviseData getSuperviseData() {
       return superviseData_ == null ? org.apache.pekko.remote.SystemMessageFormats.SuperviseData.getDefaultInstance() : superviseData_;
     }
     /**
      * optional .SuperviseData superviseData = 5;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.SystemMessageFormats.SuperviseDataOrBuilder getSuperviseDataOrBuilder() {
       return superviseData_ == null ? org.apache.pekko.remote.SystemMessageFormats.SuperviseData.getDefaultInstance() : superviseData_;
     }
@@ -536,6 +425,7 @@ public org.apache.pekko.remote.SystemMessageFormats.SuperviseDataOrBuilder getSu
      * optional .FailedData failedData = 6;
      * @return Whether the failedData field is set.
      */
+    @java.lang.Override
     public boolean hasFailedData() {
       return ((bitField0_ & 0x00000010) != 0);
     }
@@ -543,12 +433,14 @@ public boolean hasFailedData() {
      * optional .FailedData failedData = 6;
      * @return The failedData.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.SystemMessageFormats.FailedData getFailedData() {
       return failedData_ == null ? org.apache.pekko.remote.SystemMessageFormats.FailedData.getDefaultInstance() : failedData_;
     }
     /**
      * optional .FailedData failedData = 6;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.SystemMessageFormats.FailedDataOrBuilder getFailedDataOrBuilder() {
       return failedData_ == null ? org.apache.pekko.remote.SystemMessageFormats.FailedData.getDefaultInstance() : failedData_;
     }
@@ -559,6 +451,7 @@ public org.apache.pekko.remote.SystemMessageFormats.FailedDataOrBuilder getFaile
      * optional .DeathWatchNotificationData dwNotificationData = 7;
      * @return Whether the dwNotificationData field is set.
      */
+    @java.lang.Override
     public boolean hasDwNotificationData() {
       return ((bitField0_ & 0x00000020) != 0);
     }
@@ -566,12 +459,14 @@ public boolean hasDwNotificationData() {
      * optional .DeathWatchNotificationData dwNotificationData = 7;
      * @return The dwNotificationData.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationData getDwNotificationData() {
       return dwNotificationData_ == null ? org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationData.getDefaultInstance() : dwNotificationData_;
     }
     /**
      * optional .DeathWatchNotificationData dwNotificationData = 7;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationDataOrBuilder getDwNotificationDataOrBuilder() {
       return dwNotificationData_ == null ? org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationData.getDefaultInstance() : dwNotificationData_;
     }
@@ -642,7 +537,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000020) != 0)) {
         output.writeMessage(7, getDwNotificationData());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -675,7 +570,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(7, getDwNotificationData());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -719,7 +614,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getDwNotificationData()
             .equals(other.getDwNotificationData())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -754,7 +649,7 @@ public int hashCode() {
         hash = (37 * hash) + DWNOTIFICATIONDATA_FIELD_NUMBER;
         hash = (53 * hash) + getDwNotificationData().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -803,11 +698,13 @@ public static org.apache.pekko.remote.SystemMessageFormats.SystemMessage parseFr
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.SystemMessageFormats.SystemMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.SystemMessageFormats.SystemMessage parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -892,38 +789,33 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         type_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (watchDataBuilder_ == null) {
-          watchData_ = null;
-        } else {
-          watchDataBuilder_.clear();
+        watchData_ = null;
+        if (watchDataBuilder_ != null) {
+          watchDataBuilder_.dispose();
+          watchDataBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        if (causeDataBuilder_ == null) {
-          causeData_ = null;
-        } else {
-          causeDataBuilder_.clear();
+        causeData_ = null;
+        if (causeDataBuilder_ != null) {
+          causeDataBuilder_.dispose();
+          causeDataBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000004);
-        if (superviseDataBuilder_ == null) {
-          superviseData_ = null;
-        } else {
-          superviseDataBuilder_.clear();
+        superviseData_ = null;
+        if (superviseDataBuilder_ != null) {
+          superviseDataBuilder_.dispose();
+          superviseDataBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000008);
-        if (failedDataBuilder_ == null) {
-          failedData_ = null;
-        } else {
-          failedDataBuilder_.clear();
+        failedData_ = null;
+        if (failedDataBuilder_ != null) {
+          failedDataBuilder_.dispose();
+          failedDataBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000010);
-        if (dwNotificationDataBuilder_ == null) {
-          dwNotificationData_ = null;
-        } else {
-          dwNotificationDataBuilder_.clear();
+        dwNotificationData_ = null;
+        if (dwNotificationDataBuilder_ != null) {
+          dwNotificationDataBuilder_.dispose();
+          dwNotificationDataBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000020);
         return this;
       }
 
@@ -950,55 +842,49 @@ public org.apache.pekko.remote.SystemMessageFormats.SystemMessage build() {
       @java.lang.Override
       public org.apache.pekko.remote.SystemMessageFormats.SystemMessage buildPartial() {
         org.apache.pekko.remote.SystemMessageFormats.SystemMessage result = new org.apache.pekko.remote.SystemMessageFormats.SystemMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.SystemMessageFormats.SystemMessage result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.type_ = type_;
           to_bitField0_ |= 0x00000001;
         }
-        result.type_ = type_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (watchDataBuilder_ == null) {
-            result.watchData_ = watchData_;
-          } else {
-            result.watchData_ = watchDataBuilder_.build();
-          }
+          result.watchData_ = watchDataBuilder_ == null
+              ? watchData_
+              : watchDataBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
-          if (causeDataBuilder_ == null) {
-            result.causeData_ = causeData_;
-          } else {
-            result.causeData_ = causeDataBuilder_.build();
-          }
+          result.causeData_ = causeDataBuilder_ == null
+              ? causeData_
+              : causeDataBuilder_.build();
           to_bitField0_ |= 0x00000004;
         }
         if (((from_bitField0_ & 0x00000008) != 0)) {
-          if (superviseDataBuilder_ == null) {
-            result.superviseData_ = superviseData_;
-          } else {
-            result.superviseData_ = superviseDataBuilder_.build();
-          }
+          result.superviseData_ = superviseDataBuilder_ == null
+              ? superviseData_
+              : superviseDataBuilder_.build();
           to_bitField0_ |= 0x00000008;
         }
         if (((from_bitField0_ & 0x00000010) != 0)) {
-          if (failedDataBuilder_ == null) {
-            result.failedData_ = failedData_;
-          } else {
-            result.failedData_ = failedDataBuilder_.build();
-          }
+          result.failedData_ = failedDataBuilder_ == null
+              ? failedData_
+              : failedDataBuilder_.build();
           to_bitField0_ |= 0x00000010;
         }
         if (((from_bitField0_ & 0x00000020) != 0)) {
-          if (dwNotificationDataBuilder_ == null) {
-            result.dwNotificationData_ = dwNotificationData_;
-          } else {
-            result.dwNotificationData_ = dwNotificationDataBuilder_.build();
-          }
+          result.dwNotificationData_ = dwNotificationDataBuilder_ == null
+              ? dwNotificationData_
+              : dwNotificationDataBuilder_.build();
           to_bitField0_ |= 0x00000020;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1063,7 +949,7 @@ public Builder mergeFrom(org.apache.pekko.remote.SystemMessageFormats.SystemMess
         if (other.hasDwNotificationData()) {
           mergeDwNotificationData(other.getDwNotificationData());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1106,17 +992,77 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.SystemMessageFormats.SystemMessage parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                int tmpRaw = input.readEnum();
+                org.apache.pekko.remote.SystemMessageFormats.SystemMessage.Type tmpValue =
+                    org.apache.pekko.remote.SystemMessageFormats.SystemMessage.Type.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(1, tmpRaw);
+                } else {
+                  type_ = tmpRaw;
+                  bitField0_ |= 0x00000001;
+                }
+                break;
+              } // case 8
+              case 18: {
+                input.readMessage(
+                    getWatchDataFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 26: {
+                input.readMessage(
+                    getCauseDataFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              case 42: {
+                input.readMessage(
+                    getSuperviseDataFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 42
+              case 50: {
+                input.readMessage(
+                    getFailedDataFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 50
+              case 58: {
+                input.readMessage(
+                    getDwNotificationDataFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000020;
+                break;
+              } // case 58
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.SystemMessageFormats.SystemMessage) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -1126,16 +1072,16 @@ public Builder mergeFrom(
        * required .SystemMessage.Type type = 1;
        * @return Whether the type field is set.
        */
-      public boolean hasType() {
+      @java.lang.Override public boolean hasType() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        * required .SystemMessage.Type type = 1;
        * @return The type.
        */
+      @java.lang.Override
       public org.apache.pekko.remote.SystemMessageFormats.SystemMessage.Type getType() {
-        @SuppressWarnings("deprecation")
-        org.apache.pekko.remote.SystemMessageFormats.SystemMessage.Type result = org.apache.pekko.remote.SystemMessageFormats.SystemMessage.Type.valueOf(type_);
+        org.apache.pekko.remote.SystemMessageFormats.SystemMessage.Type result = org.apache.pekko.remote.SystemMessageFormats.SystemMessage.Type.forNumber(type_);
         return result == null ? org.apache.pekko.remote.SystemMessageFormats.SystemMessage.Type.CREATE : result;
       }
       /**
@@ -1193,11 +1139,11 @@ public Builder setWatchData(org.apache.pekko.remote.SystemMessageFormats.WatchDa
             throw new NullPointerException();
           }
           watchData_ = value;
-          onChanged();
         } else {
           watchDataBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -1207,11 +1153,11 @@ public Builder setWatchData(
           org.apache.pekko.remote.SystemMessageFormats.WatchData.Builder builderForValue) {
         if (watchDataBuilder_ == null) {
           watchData_ = builderForValue.build();
-          onChanged();
         } else {
           watchDataBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -1220,31 +1166,32 @@ public Builder setWatchData(
       public Builder mergeWatchData(org.apache.pekko.remote.SystemMessageFormats.WatchData value) {
         if (watchDataBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              watchData_ != null &&
-              watchData_ != org.apache.pekko.remote.SystemMessageFormats.WatchData.getDefaultInstance()) {
-            watchData_ =
-              org.apache.pekko.remote.SystemMessageFormats.WatchData.newBuilder(watchData_).mergeFrom(value).buildPartial();
+            watchData_ != null &&
+            watchData_ != org.apache.pekko.remote.SystemMessageFormats.WatchData.getDefaultInstance()) {
+            getWatchDataBuilder().mergeFrom(value);
           } else {
             watchData_ = value;
           }
-          onChanged();
         } else {
           watchDataBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (watchData_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .WatchData watchData = 2;
        */
       public Builder clearWatchData() {
-        if (watchDataBuilder_ == null) {
-          watchData_ = null;
-          onChanged();
-        } else {
-          watchDataBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        watchData_ = null;
+        if (watchDataBuilder_ != null) {
+          watchDataBuilder_.dispose();
+          watchDataBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -1313,11 +1260,11 @@ public Builder setCauseData(org.apache.pekko.remote.ContainerFormats.Payload val
             throw new NullPointerException();
           }
           causeData_ = value;
-          onChanged();
         } else {
           causeDataBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -1327,11 +1274,11 @@ public Builder setCauseData(
           org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (causeDataBuilder_ == null) {
           causeData_ = builderForValue.build();
-          onChanged();
         } else {
           causeDataBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -1340,31 +1287,32 @@ public Builder setCauseData(
       public Builder mergeCauseData(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (causeDataBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
-              causeData_ != null &&
-              causeData_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
-            causeData_ =
-              org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(causeData_).mergeFrom(value).buildPartial();
+            causeData_ != null &&
+            causeData_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
+            getCauseDataBuilder().mergeFrom(value);
           } else {
             causeData_ = value;
           }
-          onChanged();
         } else {
           causeDataBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000004;
+        if (causeData_ != null) {
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .Payload causeData = 3;
        */
       public Builder clearCauseData() {
-        if (causeDataBuilder_ == null) {
-          causeData_ = null;
-          onChanged();
-        } else {
-          causeDataBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000004);
+        causeData_ = null;
+        if (causeDataBuilder_ != null) {
+          causeDataBuilder_.dispose();
+          causeDataBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -1433,11 +1381,11 @@ public Builder setSuperviseData(org.apache.pekko.remote.SystemMessageFormats.Sup
             throw new NullPointerException();
           }
           superviseData_ = value;
-          onChanged();
         } else {
           superviseDataBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000008;
+        onChanged();
         return this;
       }
       /**
@@ -1447,11 +1395,11 @@ public Builder setSuperviseData(
           org.apache.pekko.remote.SystemMessageFormats.SuperviseData.Builder builderForValue) {
         if (superviseDataBuilder_ == null) {
           superviseData_ = builderForValue.build();
-          onChanged();
         } else {
           superviseDataBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000008;
+        onChanged();
         return this;
       }
       /**
@@ -1460,31 +1408,32 @@ public Builder setSuperviseData(
       public Builder mergeSuperviseData(org.apache.pekko.remote.SystemMessageFormats.SuperviseData value) {
         if (superviseDataBuilder_ == null) {
           if (((bitField0_ & 0x00000008) != 0) &&
-              superviseData_ != null &&
-              superviseData_ != org.apache.pekko.remote.SystemMessageFormats.SuperviseData.getDefaultInstance()) {
-            superviseData_ =
-              org.apache.pekko.remote.SystemMessageFormats.SuperviseData.newBuilder(superviseData_).mergeFrom(value).buildPartial();
+            superviseData_ != null &&
+            superviseData_ != org.apache.pekko.remote.SystemMessageFormats.SuperviseData.getDefaultInstance()) {
+            getSuperviseDataBuilder().mergeFrom(value);
           } else {
             superviseData_ = value;
           }
-          onChanged();
         } else {
           superviseDataBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000008;
+        if (superviseData_ != null) {
+          bitField0_ |= 0x00000008;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .SuperviseData superviseData = 5;
        */
       public Builder clearSuperviseData() {
-        if (superviseDataBuilder_ == null) {
-          superviseData_ = null;
-          onChanged();
-        } else {
-          superviseDataBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000008);
+        superviseData_ = null;
+        if (superviseDataBuilder_ != null) {
+          superviseDataBuilder_.dispose();
+          superviseDataBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -1553,11 +1502,11 @@ public Builder setFailedData(org.apache.pekko.remote.SystemMessageFormats.Failed
             throw new NullPointerException();
           }
           failedData_ = value;
-          onChanged();
         } else {
           failedDataBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /**
@@ -1567,11 +1516,11 @@ public Builder setFailedData(
           org.apache.pekko.remote.SystemMessageFormats.FailedData.Builder builderForValue) {
         if (failedDataBuilder_ == null) {
           failedData_ = builderForValue.build();
-          onChanged();
         } else {
           failedDataBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /**
@@ -1580,31 +1529,32 @@ public Builder setFailedData(
       public Builder mergeFailedData(org.apache.pekko.remote.SystemMessageFormats.FailedData value) {
         if (failedDataBuilder_ == null) {
           if (((bitField0_ & 0x00000010) != 0) &&
-              failedData_ != null &&
-              failedData_ != org.apache.pekko.remote.SystemMessageFormats.FailedData.getDefaultInstance()) {
-            failedData_ =
-              org.apache.pekko.remote.SystemMessageFormats.FailedData.newBuilder(failedData_).mergeFrom(value).buildPartial();
+            failedData_ != null &&
+            failedData_ != org.apache.pekko.remote.SystemMessageFormats.FailedData.getDefaultInstance()) {
+            getFailedDataBuilder().mergeFrom(value);
           } else {
             failedData_ = value;
           }
-          onChanged();
         } else {
           failedDataBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000010;
+        if (failedData_ != null) {
+          bitField0_ |= 0x00000010;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .FailedData failedData = 6;
        */
       public Builder clearFailedData() {
-        if (failedDataBuilder_ == null) {
-          failedData_ = null;
-          onChanged();
-        } else {
-          failedDataBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000010);
+        failedData_ = null;
+        if (failedDataBuilder_ != null) {
+          failedDataBuilder_.dispose();
+          failedDataBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -1673,11 +1623,11 @@ public Builder setDwNotificationData(org.apache.pekko.remote.SystemMessageFormat
             throw new NullPointerException();
           }
           dwNotificationData_ = value;
-          onChanged();
         } else {
           dwNotificationDataBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000020;
+        onChanged();
         return this;
       }
       /**
@@ -1687,11 +1637,11 @@ public Builder setDwNotificationData(
           org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationData.Builder builderForValue) {
         if (dwNotificationDataBuilder_ == null) {
           dwNotificationData_ = builderForValue.build();
-          onChanged();
         } else {
           dwNotificationDataBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000020;
+        onChanged();
         return this;
       }
       /**
@@ -1700,31 +1650,32 @@ public Builder setDwNotificationData(
       public Builder mergeDwNotificationData(org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationData value) {
         if (dwNotificationDataBuilder_ == null) {
           if (((bitField0_ & 0x00000020) != 0) &&
-              dwNotificationData_ != null &&
-              dwNotificationData_ != org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationData.getDefaultInstance()) {
-            dwNotificationData_ =
-              org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationData.newBuilder(dwNotificationData_).mergeFrom(value).buildPartial();
+            dwNotificationData_ != null &&
+            dwNotificationData_ != org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationData.getDefaultInstance()) {
+            getDwNotificationDataBuilder().mergeFrom(value);
           } else {
             dwNotificationData_ = value;
           }
-          onChanged();
         } else {
           dwNotificationDataBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000020;
+        if (dwNotificationData_ != null) {
+          bitField0_ |= 0x00000020;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .DeathWatchNotificationData dwNotificationData = 7;
        */
       public Builder clearDwNotificationData() {
-        if (dwNotificationDataBuilder_ == null) {
-          dwNotificationData_ = null;
-          onChanged();
-        } else {
-          dwNotificationDataBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000020);
+        dwNotificationData_ = null;
+        if (dwNotificationDataBuilder_ != null) {
+          dwNotificationDataBuilder_.dispose();
+          dwNotificationDataBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -1795,7 +1746,18 @@ public SystemMessage parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new SystemMessage(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -1852,7 +1814,7 @@ public interface WatchDataOrBuilder extends
   /**
    * Protobuf type {@code WatchData}
    */
-  public  static final class WatchData extends
+  public static final class WatchData extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:WatchData)
       WatchDataOrBuilder {
@@ -1871,75 +1833,6 @@ protected java.lang.Object newInstance(
       return new WatchData();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private WatchData(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.ContainerFormats.ActorRef.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = watchee_.toBuilder();
-              }
-              watchee_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.ActorRef.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(watchee_);
-                watchee_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.remote.ContainerFormats.ActorRef.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = watcher_.toBuilder();
-              }
-              watcher_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.ActorRef.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(watcher_);
-                watcher_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.SystemMessageFormats.internal_static_WatchData_descriptor;
@@ -1960,6 +1853,7 @@ private WatchData(
      * required .ActorRef watchee = 1;
      * @return Whether the watchee field is set.
      */
+    @java.lang.Override
     public boolean hasWatchee() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -1967,12 +1861,14 @@ public boolean hasWatchee() {
      * required .ActorRef watchee = 1;
      * @return The watchee.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.ActorRef getWatchee() {
       return watchee_ == null ? org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance() : watchee_;
     }
     /**
      * required .ActorRef watchee = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.ActorRefOrBuilder getWatcheeOrBuilder() {
       return watchee_ == null ? org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance() : watchee_;
     }
@@ -1983,6 +1879,7 @@ public org.apache.pekko.remote.ContainerFormats.ActorRefOrBuilder getWatcheeOrBu
      * required .ActorRef watcher = 2;
      * @return Whether the watcher field is set.
      */
+    @java.lang.Override
     public boolean hasWatcher() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -1990,12 +1887,14 @@ public boolean hasWatcher() {
      * required .ActorRef watcher = 2;
      * @return The watcher.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.ActorRef getWatcher() {
       return watcher_ == null ? org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance() : watcher_;
     }
     /**
      * required .ActorRef watcher = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.ActorRefOrBuilder getWatcherOrBuilder() {
       return watcher_ == null ? org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance() : watcher_;
     }
@@ -2036,7 +1935,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getWatcher());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -2053,7 +1952,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getWatcher());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2078,7 +1977,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getWatcher()
             .equals(other.getWatcher())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -2097,7 +1996,7 @@ public int hashCode() {
         hash = (37 * hash) + WATCHER_FIELD_NUMBER;
         hash = (53 * hash) + getWatcher().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -2146,11 +2045,13 @@ public static org.apache.pekko.remote.SystemMessageFormats.WatchData parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.SystemMessageFormats.WatchData parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.SystemMessageFormats.WatchData parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -2232,18 +2133,17 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (watcheeBuilder_ == null) {
-          watchee_ = null;
-        } else {
-          watcheeBuilder_.clear();
+        bitField0_ = 0;
+        watchee_ = null;
+        if (watcheeBuilder_ != null) {
+          watcheeBuilder_.dispose();
+          watcheeBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (watcherBuilder_ == null) {
-          watcher_ = null;
-        } else {
-          watcherBuilder_.clear();
+        watcher_ = null;
+        if (watcherBuilder_ != null) {
+          watcherBuilder_.dispose();
+          watcherBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -2270,27 +2170,27 @@ public org.apache.pekko.remote.SystemMessageFormats.WatchData build() {
       @java.lang.Override
       public org.apache.pekko.remote.SystemMessageFormats.WatchData buildPartial() {
         org.apache.pekko.remote.SystemMessageFormats.WatchData result = new org.apache.pekko.remote.SystemMessageFormats.WatchData(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.SystemMessageFormats.WatchData result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (watcheeBuilder_ == null) {
-            result.watchee_ = watchee_;
-          } else {
-            result.watchee_ = watcheeBuilder_.build();
-          }
+          result.watchee_ = watcheeBuilder_ == null
+              ? watchee_
+              : watcheeBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (watcherBuilder_ == null) {
-            result.watcher_ = watcher_;
-          } else {
-            result.watcher_ = watcherBuilder_.build();
-          }
+          result.watcher_ = watcherBuilder_ == null
+              ? watcher_
+              : watcherBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -2343,7 +2243,7 @@ public Builder mergeFrom(org.apache.pekko.remote.SystemMessageFormats.WatchData
         if (other.hasWatcher()) {
           mergeWatcher(other.getWatcher());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -2370,17 +2270,44 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.SystemMessageFormats.WatchData parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getWatcheeFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getWatcherFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.SystemMessageFormats.WatchData) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -2415,11 +2342,11 @@ public Builder setWatchee(org.apache.pekko.remote.ContainerFormats.ActorRef valu
             throw new NullPointerException();
           }
           watchee_ = value;
-          onChanged();
         } else {
           watcheeBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -2429,11 +2356,11 @@ public Builder setWatchee(
           org.apache.pekko.remote.ContainerFormats.ActorRef.Builder builderForValue) {
         if (watcheeBuilder_ == null) {
           watchee_ = builderForValue.build();
-          onChanged();
         } else {
           watcheeBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -2442,31 +2369,32 @@ public Builder setWatchee(
       public Builder mergeWatchee(org.apache.pekko.remote.ContainerFormats.ActorRef value) {
         if (watcheeBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              watchee_ != null &&
-              watchee_ != org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance()) {
-            watchee_ =
-              org.apache.pekko.remote.ContainerFormats.ActorRef.newBuilder(watchee_).mergeFrom(value).buildPartial();
+            watchee_ != null &&
+            watchee_ != org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance()) {
+            getWatcheeBuilder().mergeFrom(value);
           } else {
             watchee_ = value;
           }
-          onChanged();
         } else {
           watcheeBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (watchee_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .ActorRef watchee = 1;
        */
       public Builder clearWatchee() {
-        if (watcheeBuilder_ == null) {
-          watchee_ = null;
-          onChanged();
-        } else {
-          watcheeBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        watchee_ = null;
+        if (watcheeBuilder_ != null) {
+          watcheeBuilder_.dispose();
+          watcheeBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -2535,11 +2463,11 @@ public Builder setWatcher(org.apache.pekko.remote.ContainerFormats.ActorRef valu
             throw new NullPointerException();
           }
           watcher_ = value;
-          onChanged();
         } else {
           watcherBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -2549,11 +2477,11 @@ public Builder setWatcher(
           org.apache.pekko.remote.ContainerFormats.ActorRef.Builder builderForValue) {
         if (watcherBuilder_ == null) {
           watcher_ = builderForValue.build();
-          onChanged();
         } else {
           watcherBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -2562,31 +2490,32 @@ public Builder setWatcher(
       public Builder mergeWatcher(org.apache.pekko.remote.ContainerFormats.ActorRef value) {
         if (watcherBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              watcher_ != null &&
-              watcher_ != org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance()) {
-            watcher_ =
-              org.apache.pekko.remote.ContainerFormats.ActorRef.newBuilder(watcher_).mergeFrom(value).buildPartial();
+            watcher_ != null &&
+            watcher_ != org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance()) {
+            getWatcherBuilder().mergeFrom(value);
           } else {
             watcher_ = value;
           }
-          onChanged();
         } else {
           watcherBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (watcher_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .ActorRef watcher = 2;
        */
       public Builder clearWatcher() {
-        if (watcherBuilder_ == null) {
-          watcher_ = null;
-          onChanged();
-        } else {
-          watcherBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        watcher_ = null;
+        if (watcherBuilder_ != null) {
+          watcherBuilder_.dispose();
+          watcherBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -2657,7 +2586,18 @@ public WatchData parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new WatchData(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -2710,7 +2650,7 @@ public interface SuperviseDataOrBuilder extends
   /**
    * Protobuf type {@code SuperviseData}
    */
-  public  static final class SuperviseData extends
+  public static final class SuperviseData extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:SuperviseData)
       SuperviseDataOrBuilder {
@@ -2729,67 +2669,6 @@ protected java.lang.Object newInstance(
       return new SuperviseData();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private SuperviseData(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.ContainerFormats.ActorRef.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = child_.toBuilder();
-              }
-              child_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.ActorRef.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(child_);
-                child_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              async_ = input.readBool();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.SystemMessageFormats.internal_static_SuperviseData_descriptor;
@@ -2810,6 +2689,7 @@ private SuperviseData(
      * required .ActorRef child = 1;
      * @return Whether the child field is set.
      */
+    @java.lang.Override
     public boolean hasChild() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -2817,22 +2697,25 @@ public boolean hasChild() {
      * required .ActorRef child = 1;
      * @return The child.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.ActorRef getChild() {
       return child_ == null ? org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance() : child_;
     }
     /**
      * required .ActorRef child = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.ActorRefOrBuilder getChildOrBuilder() {
       return child_ == null ? org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance() : child_;
     }
 
     public static final int ASYNC_FIELD_NUMBER = 2;
-    private boolean async_;
+    private boolean async_ = false;
     /**
      * required bool async = 2;
      * @return Whether the async field is set.
      */
+    @java.lang.Override
     public boolean hasAsync() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -2840,6 +2723,7 @@ public boolean hasAsync() {
      * required bool async = 2;
      * @return The async.
      */
+    @java.lang.Override
     public boolean getAsync() {
       return async_;
     }
@@ -2876,7 +2760,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeBool(2, async_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -2893,7 +2777,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(2, async_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2918,7 +2802,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getAsync()
             != other.getAsync()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -2938,7 +2822,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getAsync());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -2987,11 +2871,13 @@ public static org.apache.pekko.remote.SystemMessageFormats.SuperviseData parseFr
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.SystemMessageFormats.SuperviseData parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.SystemMessageFormats.SuperviseData parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -3072,14 +2958,13 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (childBuilder_ == null) {
-          child_ = null;
-        } else {
-          childBuilder_.clear();
+        bitField0_ = 0;
+        child_ = null;
+        if (childBuilder_ != null) {
+          childBuilder_.dispose();
+          childBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         async_ = false;
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -3106,23 +2991,25 @@ public org.apache.pekko.remote.SystemMessageFormats.SuperviseData build() {
       @java.lang.Override
       public org.apache.pekko.remote.SystemMessageFormats.SuperviseData buildPartial() {
         org.apache.pekko.remote.SystemMessageFormats.SuperviseData result = new org.apache.pekko.remote.SystemMessageFormats.SuperviseData(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.SystemMessageFormats.SuperviseData result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (childBuilder_ == null) {
-            result.child_ = child_;
-          } else {
-            result.child_ = childBuilder_.build();
-          }
+          result.child_ = childBuilder_ == null
+              ? child_
+              : childBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.async_ = async_;
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -3175,7 +3062,7 @@ public Builder mergeFrom(org.apache.pekko.remote.SystemMessageFormats.SuperviseD
         if (other.hasAsync()) {
           setAsync(other.getAsync());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -3199,17 +3086,42 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.SystemMessageFormats.SuperviseData parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getChildFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                async_ = input.readBool();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.SystemMessageFormats.SuperviseData) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -3244,11 +3156,11 @@ public Builder setChild(org.apache.pekko.remote.ContainerFormats.ActorRef value)
             throw new NullPointerException();
           }
           child_ = value;
-          onChanged();
         } else {
           childBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -3258,11 +3170,11 @@ public Builder setChild(
           org.apache.pekko.remote.ContainerFormats.ActorRef.Builder builderForValue) {
         if (childBuilder_ == null) {
           child_ = builderForValue.build();
-          onChanged();
         } else {
           childBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -3271,31 +3183,32 @@ public Builder setChild(
       public Builder mergeChild(org.apache.pekko.remote.ContainerFormats.ActorRef value) {
         if (childBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              child_ != null &&
-              child_ != org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance()) {
-            child_ =
-              org.apache.pekko.remote.ContainerFormats.ActorRef.newBuilder(child_).mergeFrom(value).buildPartial();
+            child_ != null &&
+            child_ != org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance()) {
+            getChildBuilder().mergeFrom(value);
           } else {
             child_ = value;
           }
-          onChanged();
         } else {
           childBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (child_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .ActorRef child = 1;
        */
       public Builder clearChild() {
-        if (childBuilder_ == null) {
-          child_ = null;
-          onChanged();
-        } else {
-          childBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        child_ = null;
+        if (childBuilder_ != null) {
+          childBuilder_.dispose();
+          childBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -3339,6 +3252,7 @@ public org.apache.pekko.remote.ContainerFormats.ActorRefOrBuilder getChildOrBuil
        * required bool async = 2;
        * @return Whether the async field is set.
        */
+      @java.lang.Override
       public boolean hasAsync() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -3346,6 +3260,7 @@ public boolean hasAsync() {
        * required bool async = 2;
        * @return The async.
        */
+      @java.lang.Override
       public boolean getAsync() {
         return async_;
       }
@@ -3355,8 +3270,9 @@ public boolean getAsync() {
        * @return This builder for chaining.
        */
       public Builder setAsync(boolean value) {
-        bitField0_ |= 0x00000002;
+
         async_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -3403,7 +3319,18 @@ public SuperviseData parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new SuperviseData(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -3456,7 +3383,7 @@ public interface FailedDataOrBuilder extends
   /**
    * Protobuf type {@code FailedData}
    */
-  public  static final class FailedData extends
+  public static final class FailedData extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:FailedData)
       FailedDataOrBuilder {
@@ -3475,67 +3402,6 @@ protected java.lang.Object newInstance(
       return new FailedData();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private FailedData(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.ContainerFormats.ActorRef.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = child_.toBuilder();
-              }
-              child_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.ActorRef.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(child_);
-                child_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              uid_ = input.readUInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.SystemMessageFormats.internal_static_FailedData_descriptor;
@@ -3556,6 +3422,7 @@ private FailedData(
      * required .ActorRef child = 1;
      * @return Whether the child field is set.
      */
+    @java.lang.Override
     public boolean hasChild() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -3563,22 +3430,25 @@ public boolean hasChild() {
      * required .ActorRef child = 1;
      * @return The child.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.ActorRef getChild() {
       return child_ == null ? org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance() : child_;
     }
     /**
      * required .ActorRef child = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.ActorRefOrBuilder getChildOrBuilder() {
       return child_ == null ? org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance() : child_;
     }
 
     public static final int UID_FIELD_NUMBER = 2;
-    private long uid_;
+    private long uid_ = 0L;
     /**
      * required uint64 uid = 2;
      * @return Whether the uid field is set.
      */
+    @java.lang.Override
     public boolean hasUid() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -3586,6 +3456,7 @@ public boolean hasUid() {
      * required uint64 uid = 2;
      * @return The uid.
      */
+    @java.lang.Override
     public long getUid() {
       return uid_;
     }
@@ -3622,7 +3493,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeUInt64(2, uid_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -3639,7 +3510,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt64Size(2, uid_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -3664,7 +3535,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getUid()
             != other.getUid()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -3684,7 +3555,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getUid());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3733,11 +3604,13 @@ public static org.apache.pekko.remote.SystemMessageFormats.FailedData parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.SystemMessageFormats.FailedData parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.SystemMessageFormats.FailedData parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -3818,14 +3691,13 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (childBuilder_ == null) {
-          child_ = null;
-        } else {
-          childBuilder_.clear();
+        bitField0_ = 0;
+        child_ = null;
+        if (childBuilder_ != null) {
+          childBuilder_.dispose();
+          childBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         uid_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -3852,23 +3724,25 @@ public org.apache.pekko.remote.SystemMessageFormats.FailedData build() {
       @java.lang.Override
       public org.apache.pekko.remote.SystemMessageFormats.FailedData buildPartial() {
         org.apache.pekko.remote.SystemMessageFormats.FailedData result = new org.apache.pekko.remote.SystemMessageFormats.FailedData(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.SystemMessageFormats.FailedData result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (childBuilder_ == null) {
-            result.child_ = child_;
-          } else {
-            result.child_ = childBuilder_.build();
-          }
+          result.child_ = childBuilder_ == null
+              ? child_
+              : childBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.uid_ = uid_;
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -3921,7 +3795,7 @@ public Builder mergeFrom(org.apache.pekko.remote.SystemMessageFormats.FailedData
         if (other.hasUid()) {
           setUid(other.getUid());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -3945,17 +3819,42 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.SystemMessageFormats.FailedData parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getChildFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                uid_ = input.readUInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.SystemMessageFormats.FailedData) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -3990,11 +3889,11 @@ public Builder setChild(org.apache.pekko.remote.ContainerFormats.ActorRef value)
             throw new NullPointerException();
           }
           child_ = value;
-          onChanged();
         } else {
           childBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -4004,11 +3903,11 @@ public Builder setChild(
           org.apache.pekko.remote.ContainerFormats.ActorRef.Builder builderForValue) {
         if (childBuilder_ == null) {
           child_ = builderForValue.build();
-          onChanged();
         } else {
           childBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -4017,31 +3916,32 @@ public Builder setChild(
       public Builder mergeChild(org.apache.pekko.remote.ContainerFormats.ActorRef value) {
         if (childBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              child_ != null &&
-              child_ != org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance()) {
-            child_ =
-              org.apache.pekko.remote.ContainerFormats.ActorRef.newBuilder(child_).mergeFrom(value).buildPartial();
+            child_ != null &&
+            child_ != org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance()) {
+            getChildBuilder().mergeFrom(value);
           } else {
             child_ = value;
           }
-          onChanged();
         } else {
           childBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (child_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .ActorRef child = 1;
        */
       public Builder clearChild() {
-        if (childBuilder_ == null) {
-          child_ = null;
-          onChanged();
-        } else {
-          childBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        child_ = null;
+        if (childBuilder_ != null) {
+          childBuilder_.dispose();
+          childBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -4085,6 +3985,7 @@ public org.apache.pekko.remote.ContainerFormats.ActorRefOrBuilder getChildOrBuil
        * required uint64 uid = 2;
        * @return Whether the uid field is set.
        */
+      @java.lang.Override
       public boolean hasUid() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -4092,6 +3993,7 @@ public boolean hasUid() {
        * required uint64 uid = 2;
        * @return The uid.
        */
+      @java.lang.Override
       public long getUid() {
         return uid_;
       }
@@ -4101,8 +4003,9 @@ public long getUid() {
        * @return This builder for chaining.
        */
       public Builder setUid(long value) {
-        bitField0_ |= 0x00000002;
+
         uid_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4149,7 +4052,18 @@ public FailedData parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new FailedData(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -4213,7 +4127,7 @@ public interface DeathWatchNotificationDataOrBuilder extends
   /**
    * Protobuf type {@code DeathWatchNotificationData}
    */
-  public  static final class DeathWatchNotificationData extends
+  public static final class DeathWatchNotificationData extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:DeathWatchNotificationData)
       DeathWatchNotificationDataOrBuilder {
@@ -4232,72 +4146,6 @@ protected java.lang.Object newInstance(
       return new DeathWatchNotificationData();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private DeathWatchNotificationData(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.ContainerFormats.ActorRef.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = actor_.toBuilder();
-              }
-              actor_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.ActorRef.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(actor_);
-                actor_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              existenceConfirmed_ = input.readBool();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              addressTerminated_ = input.readBool();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.SystemMessageFormats.internal_static_DeathWatchNotificationData_descriptor;
@@ -4318,6 +4166,7 @@ private DeathWatchNotificationData(
      * required .ActorRef actor = 1;
      * @return Whether the actor field is set.
      */
+    @java.lang.Override
     public boolean hasActor() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -4325,22 +4174,25 @@ public boolean hasActor() {
      * required .ActorRef actor = 1;
      * @return The actor.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.ActorRef getActor() {
       return actor_ == null ? org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance() : actor_;
     }
     /**
      * required .ActorRef actor = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.ActorRefOrBuilder getActorOrBuilder() {
       return actor_ == null ? org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance() : actor_;
     }
 
     public static final int EXISTENCECONFIRMED_FIELD_NUMBER = 2;
-    private boolean existenceConfirmed_;
+    private boolean existenceConfirmed_ = false;
     /**
      * required bool existenceConfirmed = 2;
      * @return Whether the existenceConfirmed field is set.
      */
+    @java.lang.Override
     public boolean hasExistenceConfirmed() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -4348,16 +4200,18 @@ public boolean hasExistenceConfirmed() {
      * required bool existenceConfirmed = 2;
      * @return The existenceConfirmed.
      */
+    @java.lang.Override
     public boolean getExistenceConfirmed() {
       return existenceConfirmed_;
     }
 
     public static final int ADDRESSTERMINATED_FIELD_NUMBER = 3;
-    private boolean addressTerminated_;
+    private boolean addressTerminated_ = false;
     /**
      * required bool addressTerminated = 3;
      * @return Whether the addressTerminated field is set.
      */
+    @java.lang.Override
     public boolean hasAddressTerminated() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -4365,6 +4219,7 @@ public boolean hasAddressTerminated() {
      * required bool addressTerminated = 3;
      * @return The addressTerminated.
      */
+    @java.lang.Override
     public boolean getAddressTerminated() {
       return addressTerminated_;
     }
@@ -4408,7 +4263,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeBool(3, addressTerminated_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -4429,7 +4284,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(3, addressTerminated_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4459,7 +4314,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getAddressTerminated()
             != other.getAddressTerminated()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -4484,7 +4339,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getAddressTerminated());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4533,11 +4388,13 @@ public static org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificatio
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationData parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationData parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -4618,16 +4475,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (actorBuilder_ == null) {
-          actor_ = null;
-        } else {
-          actorBuilder_.clear();
+        bitField0_ = 0;
+        actor_ = null;
+        if (actorBuilder_ != null) {
+          actorBuilder_.dispose();
+          actorBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         existenceConfirmed_ = false;
-        bitField0_ = (bitField0_ & ~0x00000002);
         addressTerminated_ = false;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -4654,14 +4509,18 @@ public org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationData b
       @java.lang.Override
       public org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationData buildPartial() {
         org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationData result = new org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationData(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationData result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (actorBuilder_ == null) {
-            result.actor_ = actor_;
-          } else {
-            result.actor_ = actorBuilder_.build();
-          }
+          result.actor_ = actorBuilder_ == null
+              ? actor_
+              : actorBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
@@ -4672,9 +4531,7 @@ public org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationData b
           result.addressTerminated_ = addressTerminated_;
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -4730,7 +4587,7 @@ public Builder mergeFrom(org.apache.pekko.remote.SystemMessageFormats.DeathWatch
         if (other.hasAddressTerminated()) {
           setAddressTerminated(other.getAddressTerminated());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -4757,17 +4614,47 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationData parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getActorFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                existenceConfirmed_ = input.readBool();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                addressTerminated_ = input.readBool();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.SystemMessageFormats.DeathWatchNotificationData) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -4802,11 +4689,11 @@ public Builder setActor(org.apache.pekko.remote.ContainerFormats.ActorRef value)
             throw new NullPointerException();
           }
           actor_ = value;
-          onChanged();
         } else {
           actorBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -4816,11 +4703,11 @@ public Builder setActor(
           org.apache.pekko.remote.ContainerFormats.ActorRef.Builder builderForValue) {
         if (actorBuilder_ == null) {
           actor_ = builderForValue.build();
-          onChanged();
         } else {
           actorBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -4829,31 +4716,32 @@ public Builder setActor(
       public Builder mergeActor(org.apache.pekko.remote.ContainerFormats.ActorRef value) {
         if (actorBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              actor_ != null &&
-              actor_ != org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance()) {
-            actor_ =
-              org.apache.pekko.remote.ContainerFormats.ActorRef.newBuilder(actor_).mergeFrom(value).buildPartial();
+            actor_ != null &&
+            actor_ != org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance()) {
+            getActorBuilder().mergeFrom(value);
           } else {
             actor_ = value;
           }
-          onChanged();
         } else {
           actorBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (actor_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .ActorRef actor = 1;
        */
       public Builder clearActor() {
-        if (actorBuilder_ == null) {
-          actor_ = null;
-          onChanged();
-        } else {
-          actorBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        actor_ = null;
+        if (actorBuilder_ != null) {
+          actorBuilder_.dispose();
+          actorBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -4897,6 +4785,7 @@ public org.apache.pekko.remote.ContainerFormats.ActorRefOrBuilder getActorOrBuil
        * required bool existenceConfirmed = 2;
        * @return Whether the existenceConfirmed field is set.
        */
+      @java.lang.Override
       public boolean hasExistenceConfirmed() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -4904,6 +4793,7 @@ public boolean hasExistenceConfirmed() {
        * required bool existenceConfirmed = 2;
        * @return The existenceConfirmed.
        */
+      @java.lang.Override
       public boolean getExistenceConfirmed() {
         return existenceConfirmed_;
       }
@@ -4913,8 +4803,9 @@ public boolean getExistenceConfirmed() {
        * @return This builder for chaining.
        */
       public Builder setExistenceConfirmed(boolean value) {
-        bitField0_ |= 0x00000002;
+
         existenceConfirmed_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4934,6 +4825,7 @@ public Builder clearExistenceConfirmed() {
        * required bool addressTerminated = 3;
        * @return Whether the addressTerminated field is set.
        */
+      @java.lang.Override
       public boolean hasAddressTerminated() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -4941,6 +4833,7 @@ public boolean hasAddressTerminated() {
        * required bool addressTerminated = 3;
        * @return The addressTerminated.
        */
+      @java.lang.Override
       public boolean getAddressTerminated() {
         return addressTerminated_;
       }
@@ -4950,8 +4843,9 @@ public boolean getAddressTerminated() {
        * @return This builder for chaining.
        */
       public Builder setAddressTerminated(boolean value) {
-        bitField0_ |= 0x00000004;
+
         addressTerminated_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -4998,7 +4892,18 @@ public DeathWatchNotificationData parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new DeathWatchNotificationData(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
diff --git a/remote/src/main/java/org/apache/pekko/remote/WireFormats.java b/remote/src/main/java/org/apache/pekko/remote/WireFormats.java
index 6e4153b4168..6cd1c31169b 100644
--- a/remote/src/main/java/org/apache/pekko/remote/WireFormats.java
+++ b/remote/src/main/java/org/apache/pekko/remote/WireFormats.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2021-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: WireFormats.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.remote;
 
 public final class WireFormats {
@@ -354,7 +355,7 @@ public interface AckAndEnvelopeContainerOrBuilder extends
   /**
    * Protobuf type {@code AckAndEnvelopeContainer}
    */
-  public  static final class AckAndEnvelopeContainer extends
+  public static final class AckAndEnvelopeContainer extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:AckAndEnvelopeContainer)
       AckAndEnvelopeContainerOrBuilder {
@@ -373,75 +374,6 @@ protected java.lang.Object newInstance(
       return new AckAndEnvelopeContainer();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private AckAndEnvelopeContainer(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.WireFormats.AcknowledgementInfo.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = ack_.toBuilder();
-              }
-              ack_ = input.readMessage(org.apache.pekko.remote.WireFormats.AcknowledgementInfo.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(ack_);
-                ack_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.remote.WireFormats.RemoteEnvelope.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = envelope_.toBuilder();
-              }
-              envelope_ = input.readMessage(org.apache.pekko.remote.WireFormats.RemoteEnvelope.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(envelope_);
-                envelope_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.WireFormats.internal_static_AckAndEnvelopeContainer_descriptor;
@@ -462,6 +394,7 @@ private AckAndEnvelopeContainer(
      * optional .AcknowledgementInfo ack = 1;
      * @return Whether the ack field is set.
      */
+    @java.lang.Override
     public boolean hasAck() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -469,12 +402,14 @@ public boolean hasAck() {
      * optional .AcknowledgementInfo ack = 1;
      * @return The ack.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.AcknowledgementInfo getAck() {
       return ack_ == null ? org.apache.pekko.remote.WireFormats.AcknowledgementInfo.getDefaultInstance() : ack_;
     }
     /**
      * optional .AcknowledgementInfo ack = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.AcknowledgementInfoOrBuilder getAckOrBuilder() {
       return ack_ == null ? org.apache.pekko.remote.WireFormats.AcknowledgementInfo.getDefaultInstance() : ack_;
     }
@@ -485,6 +420,7 @@ public org.apache.pekko.remote.WireFormats.AcknowledgementInfoOrBuilder getAckOr
      * optional .RemoteEnvelope envelope = 2;
      * @return Whether the envelope field is set.
      */
+    @java.lang.Override
     public boolean hasEnvelope() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -492,12 +428,14 @@ public boolean hasEnvelope() {
      * optional .RemoteEnvelope envelope = 2;
      * @return The envelope.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.RemoteEnvelope getEnvelope() {
       return envelope_ == null ? org.apache.pekko.remote.WireFormats.RemoteEnvelope.getDefaultInstance() : envelope_;
     }
     /**
      * optional .RemoteEnvelope envelope = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.RemoteEnvelopeOrBuilder getEnvelopeOrBuilder() {
       return envelope_ == null ? org.apache.pekko.remote.WireFormats.RemoteEnvelope.getDefaultInstance() : envelope_;
     }
@@ -534,7 +472,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getEnvelope());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -551,7 +489,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getEnvelope());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -576,7 +514,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getEnvelope()
             .equals(other.getEnvelope())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -595,7 +533,7 @@ public int hashCode() {
         hash = (37 * hash) + ENVELOPE_FIELD_NUMBER;
         hash = (53 * hash) + getEnvelope().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -644,11 +582,13 @@ public static org.apache.pekko.remote.WireFormats.AckAndEnvelopeContainer parseF
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.WireFormats.AckAndEnvelopeContainer parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.WireFormats.AckAndEnvelopeContainer parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -730,18 +670,17 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (ackBuilder_ == null) {
-          ack_ = null;
-        } else {
-          ackBuilder_.clear();
+        bitField0_ = 0;
+        ack_ = null;
+        if (ackBuilder_ != null) {
+          ackBuilder_.dispose();
+          ackBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (envelopeBuilder_ == null) {
-          envelope_ = null;
-        } else {
-          envelopeBuilder_.clear();
+        envelope_ = null;
+        if (envelopeBuilder_ != null) {
+          envelopeBuilder_.dispose();
+          envelopeBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -768,27 +707,27 @@ public org.apache.pekko.remote.WireFormats.AckAndEnvelopeContainer build() {
       @java.lang.Override
       public org.apache.pekko.remote.WireFormats.AckAndEnvelopeContainer buildPartial() {
         org.apache.pekko.remote.WireFormats.AckAndEnvelopeContainer result = new org.apache.pekko.remote.WireFormats.AckAndEnvelopeContainer(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.WireFormats.AckAndEnvelopeContainer result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (ackBuilder_ == null) {
-            result.ack_ = ack_;
-          } else {
-            result.ack_ = ackBuilder_.build();
-          }
+          result.ack_ = ackBuilder_ == null
+              ? ack_
+              : ackBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (envelopeBuilder_ == null) {
-            result.envelope_ = envelope_;
-          } else {
-            result.envelope_ = envelopeBuilder_.build();
-          }
+          result.envelope_ = envelopeBuilder_ == null
+              ? envelope_
+              : envelopeBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -841,7 +780,7 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.AckAndEnvelopeConta
         if (other.hasEnvelope()) {
           mergeEnvelope(other.getEnvelope());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -866,17 +805,44 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.WireFormats.AckAndEnvelopeContainer parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getAckFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getEnvelopeFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.WireFormats.AckAndEnvelopeContainer) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -911,11 +877,11 @@ public Builder setAck(org.apache.pekko.remote.WireFormats.AcknowledgementInfo va
             throw new NullPointerException();
           }
           ack_ = value;
-          onChanged();
         } else {
           ackBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -925,11 +891,11 @@ public Builder setAck(
           org.apache.pekko.remote.WireFormats.AcknowledgementInfo.Builder builderForValue) {
         if (ackBuilder_ == null) {
           ack_ = builderForValue.build();
-          onChanged();
         } else {
           ackBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -938,31 +904,32 @@ public Builder setAck(
       public Builder mergeAck(org.apache.pekko.remote.WireFormats.AcknowledgementInfo value) {
         if (ackBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              ack_ != null &&
-              ack_ != org.apache.pekko.remote.WireFormats.AcknowledgementInfo.getDefaultInstance()) {
-            ack_ =
-              org.apache.pekko.remote.WireFormats.AcknowledgementInfo.newBuilder(ack_).mergeFrom(value).buildPartial();
+            ack_ != null &&
+            ack_ != org.apache.pekko.remote.WireFormats.AcknowledgementInfo.getDefaultInstance()) {
+            getAckBuilder().mergeFrom(value);
           } else {
             ack_ = value;
           }
-          onChanged();
         } else {
           ackBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (ack_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .AcknowledgementInfo ack = 1;
        */
       public Builder clearAck() {
-        if (ackBuilder_ == null) {
-          ack_ = null;
-          onChanged();
-        } else {
-          ackBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        ack_ = null;
+        if (ackBuilder_ != null) {
+          ackBuilder_.dispose();
+          ackBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -1031,11 +998,11 @@ public Builder setEnvelope(org.apache.pekko.remote.WireFormats.RemoteEnvelope va
             throw new NullPointerException();
           }
           envelope_ = value;
-          onChanged();
         } else {
           envelopeBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -1045,11 +1012,11 @@ public Builder setEnvelope(
           org.apache.pekko.remote.WireFormats.RemoteEnvelope.Builder builderForValue) {
         if (envelopeBuilder_ == null) {
           envelope_ = builderForValue.build();
-          onChanged();
         } else {
           envelopeBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -1058,31 +1025,32 @@ public Builder setEnvelope(
       public Builder mergeEnvelope(org.apache.pekko.remote.WireFormats.RemoteEnvelope value) {
         if (envelopeBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              envelope_ != null &&
-              envelope_ != org.apache.pekko.remote.WireFormats.RemoteEnvelope.getDefaultInstance()) {
-            envelope_ =
-              org.apache.pekko.remote.WireFormats.RemoteEnvelope.newBuilder(envelope_).mergeFrom(value).buildPartial();
+            envelope_ != null &&
+            envelope_ != org.apache.pekko.remote.WireFormats.RemoteEnvelope.getDefaultInstance()) {
+            getEnvelopeBuilder().mergeFrom(value);
           } else {
             envelope_ = value;
           }
-          onChanged();
         } else {
           envelopeBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (envelope_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .RemoteEnvelope envelope = 2;
        */
       public Builder clearEnvelope() {
-        if (envelopeBuilder_ == null) {
-          envelope_ = null;
-          onChanged();
-        } else {
-          envelopeBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        envelope_ = null;
+        if (envelopeBuilder_ != null) {
+          envelopeBuilder_.dispose();
+          envelopeBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -1153,7 +1121,18 @@ public AckAndEnvelopeContainer parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new AckAndEnvelopeContainer(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -1241,7 +1220,7 @@ public interface RemoteEnvelopeOrBuilder extends
    *
    * Protobuf type {@code RemoteEnvelope}
    */
-  public  static final class RemoteEnvelope extends
+  public static final class RemoteEnvelope extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:RemoteEnvelope)
       RemoteEnvelopeOrBuilder {
@@ -1260,93 +1239,6 @@ protected java.lang.Object newInstance(
       return new RemoteEnvelope();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private RemoteEnvelope(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.WireFormats.ActorRefData.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = recipient_.toBuilder();
-              }
-              recipient_ = input.readMessage(org.apache.pekko.remote.WireFormats.ActorRefData.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(recipient_);
-                recipient_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.remote.WireFormats.SerializedMessage.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = message_.toBuilder();
-              }
-              message_ = input.readMessage(org.apache.pekko.remote.WireFormats.SerializedMessage.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(message_);
-                message_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            case 34: {
-              org.apache.pekko.remote.WireFormats.ActorRefData.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000004) != 0)) {
-                subBuilder = sender_.toBuilder();
-              }
-              sender_ = input.readMessage(org.apache.pekko.remote.WireFormats.ActorRefData.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(sender_);
-                sender_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000004;
-              break;
-            }
-            case 41: {
-              bitField0_ |= 0x00000008;
-              seq_ = input.readFixed64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.WireFormats.internal_static_RemoteEnvelope_descriptor;
@@ -1367,6 +1259,7 @@ private RemoteEnvelope(
      * required .ActorRefData recipient = 1;
      * @return Whether the recipient field is set.
      */
+    @java.lang.Override
     public boolean hasRecipient() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -1374,12 +1267,14 @@ public boolean hasRecipient() {
      * required .ActorRefData recipient = 1;
      * @return The recipient.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.ActorRefData getRecipient() {
       return recipient_ == null ? org.apache.pekko.remote.WireFormats.ActorRefData.getDefaultInstance() : recipient_;
     }
     /**
      * required .ActorRefData recipient = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.ActorRefDataOrBuilder getRecipientOrBuilder() {
       return recipient_ == null ? org.apache.pekko.remote.WireFormats.ActorRefData.getDefaultInstance() : recipient_;
     }
@@ -1390,6 +1285,7 @@ public org.apache.pekko.remote.WireFormats.ActorRefDataOrBuilder getRecipientOrB
      * required .SerializedMessage message = 2;
      * @return Whether the message field is set.
      */
+    @java.lang.Override
     public boolean hasMessage() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -1397,12 +1293,14 @@ public boolean hasMessage() {
      * required .SerializedMessage message = 2;
      * @return The message.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.SerializedMessage getMessage() {
       return message_ == null ? org.apache.pekko.remote.WireFormats.SerializedMessage.getDefaultInstance() : message_;
     }
     /**
      * required .SerializedMessage message = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.SerializedMessageOrBuilder getMessageOrBuilder() {
       return message_ == null ? org.apache.pekko.remote.WireFormats.SerializedMessage.getDefaultInstance() : message_;
     }
@@ -1413,6 +1311,7 @@ public org.apache.pekko.remote.WireFormats.SerializedMessageOrBuilder getMessage
      * optional .ActorRefData sender = 4;
      * @return Whether the sender field is set.
      */
+    @java.lang.Override
     public boolean hasSender() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -1420,22 +1319,25 @@ public boolean hasSender() {
      * optional .ActorRefData sender = 4;
      * @return The sender.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.ActorRefData getSender() {
       return sender_ == null ? org.apache.pekko.remote.WireFormats.ActorRefData.getDefaultInstance() : sender_;
     }
     /**
      * optional .ActorRefData sender = 4;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.ActorRefDataOrBuilder getSenderOrBuilder() {
       return sender_ == null ? org.apache.pekko.remote.WireFormats.ActorRefData.getDefaultInstance() : sender_;
     }
 
     public static final int SEQ_FIELD_NUMBER = 5;
-    private long seq_;
+    private long seq_ = 0L;
     /**
      * optional fixed64 seq = 5;
      * @return Whether the seq field is set.
      */
+    @java.lang.Override
     public boolean hasSeq() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -1443,6 +1345,7 @@ public boolean hasSeq() {
      * optional fixed64 seq = 5;
      * @return The seq.
      */
+    @java.lang.Override
     public long getSeq() {
       return seq_;
     }
@@ -1495,7 +1398,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeFixed64(5, seq_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -1520,7 +1423,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeFixed64Size(5, seq_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1555,7 +1458,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getSeq()
             != other.getSeq()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1583,7 +1486,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getSeq());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1632,11 +1535,13 @@ public static org.apache.pekko.remote.WireFormats.RemoteEnvelope parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.WireFormats.RemoteEnvelope parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.WireFormats.RemoteEnvelope parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -1724,26 +1629,23 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (recipientBuilder_ == null) {
-          recipient_ = null;
-        } else {
-          recipientBuilder_.clear();
+        bitField0_ = 0;
+        recipient_ = null;
+        if (recipientBuilder_ != null) {
+          recipientBuilder_.dispose();
+          recipientBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (messageBuilder_ == null) {
-          message_ = null;
-        } else {
-          messageBuilder_.clear();
+        message_ = null;
+        if (messageBuilder_ != null) {
+          messageBuilder_.dispose();
+          messageBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        if (senderBuilder_ == null) {
-          sender_ = null;
-        } else {
-          senderBuilder_.clear();
+        sender_ = null;
+        if (senderBuilder_ != null) {
+          senderBuilder_.dispose();
+          senderBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000004);
         seq_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -1770,39 +1672,37 @@ public org.apache.pekko.remote.WireFormats.RemoteEnvelope build() {
       @java.lang.Override
       public org.apache.pekko.remote.WireFormats.RemoteEnvelope buildPartial() {
         org.apache.pekko.remote.WireFormats.RemoteEnvelope result = new org.apache.pekko.remote.WireFormats.RemoteEnvelope(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.WireFormats.RemoteEnvelope result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (recipientBuilder_ == null) {
-            result.recipient_ = recipient_;
-          } else {
-            result.recipient_ = recipientBuilder_.build();
-          }
+          result.recipient_ = recipientBuilder_ == null
+              ? recipient_
+              : recipientBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (messageBuilder_ == null) {
-            result.message_ = message_;
-          } else {
-            result.message_ = messageBuilder_.build();
-          }
+          result.message_ = messageBuilder_ == null
+              ? message_
+              : messageBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
-          if (senderBuilder_ == null) {
-            result.sender_ = sender_;
-          } else {
-            result.sender_ = senderBuilder_.build();
-          }
+          result.sender_ = senderBuilder_ == null
+              ? sender_
+              : senderBuilder_.build();
           to_bitField0_ |= 0x00000004;
         }
         if (((from_bitField0_ & 0x00000008) != 0)) {
           result.seq_ = seq_;
           to_bitField0_ |= 0x00000008;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1861,7 +1761,7 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.RemoteEnvelope othe
         if (other.hasSeq()) {
           setSeq(other.getSeq());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1893,17 +1793,56 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.WireFormats.RemoteEnvelope parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getRecipientFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getMessageFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 34: {
+                input.readMessage(
+                    getSenderFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 34
+              case 41: {
+                seq_ = input.readFixed64();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 41
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.WireFormats.RemoteEnvelope) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -1938,11 +1877,11 @@ public Builder setRecipient(org.apache.pekko.remote.WireFormats.ActorRefData val
             throw new NullPointerException();
           }
           recipient_ = value;
-          onChanged();
         } else {
           recipientBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1952,11 +1891,11 @@ public Builder setRecipient(
           org.apache.pekko.remote.WireFormats.ActorRefData.Builder builderForValue) {
         if (recipientBuilder_ == null) {
           recipient_ = builderForValue.build();
-          onChanged();
         } else {
           recipientBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1965,31 +1904,32 @@ public Builder setRecipient(
       public Builder mergeRecipient(org.apache.pekko.remote.WireFormats.ActorRefData value) {
         if (recipientBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              recipient_ != null &&
-              recipient_ != org.apache.pekko.remote.WireFormats.ActorRefData.getDefaultInstance()) {
-            recipient_ =
-              org.apache.pekko.remote.WireFormats.ActorRefData.newBuilder(recipient_).mergeFrom(value).buildPartial();
+            recipient_ != null &&
+            recipient_ != org.apache.pekko.remote.WireFormats.ActorRefData.getDefaultInstance()) {
+            getRecipientBuilder().mergeFrom(value);
           } else {
             recipient_ = value;
           }
-          onChanged();
         } else {
           recipientBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (recipient_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .ActorRefData recipient = 1;
        */
       public Builder clearRecipient() {
-        if (recipientBuilder_ == null) {
-          recipient_ = null;
-          onChanged();
-        } else {
-          recipientBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        recipient_ = null;
+        if (recipientBuilder_ != null) {
+          recipientBuilder_.dispose();
+          recipientBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -2058,11 +1998,11 @@ public Builder setMessage(org.apache.pekko.remote.WireFormats.SerializedMessage
             throw new NullPointerException();
           }
           message_ = value;
-          onChanged();
         } else {
           messageBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -2072,11 +2012,11 @@ public Builder setMessage(
           org.apache.pekko.remote.WireFormats.SerializedMessage.Builder builderForValue) {
         if (messageBuilder_ == null) {
           message_ = builderForValue.build();
-          onChanged();
         } else {
           messageBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -2085,31 +2025,32 @@ public Builder setMessage(
       public Builder mergeMessage(org.apache.pekko.remote.WireFormats.SerializedMessage value) {
         if (messageBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              message_ != null &&
-              message_ != org.apache.pekko.remote.WireFormats.SerializedMessage.getDefaultInstance()) {
-            message_ =
-              org.apache.pekko.remote.WireFormats.SerializedMessage.newBuilder(message_).mergeFrom(value).buildPartial();
+            message_ != null &&
+            message_ != org.apache.pekko.remote.WireFormats.SerializedMessage.getDefaultInstance()) {
+            getMessageBuilder().mergeFrom(value);
           } else {
             message_ = value;
           }
-          onChanged();
         } else {
           messageBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (message_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .SerializedMessage message = 2;
        */
       public Builder clearMessage() {
-        if (messageBuilder_ == null) {
-          message_ = null;
-          onChanged();
-        } else {
-          messageBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        message_ = null;
+        if (messageBuilder_ != null) {
+          messageBuilder_.dispose();
+          messageBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -2178,11 +2119,11 @@ public Builder setSender(org.apache.pekko.remote.WireFormats.ActorRefData value)
             throw new NullPointerException();
           }
           sender_ = value;
-          onChanged();
         } else {
           senderBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -2192,11 +2133,11 @@ public Builder setSender(
           org.apache.pekko.remote.WireFormats.ActorRefData.Builder builderForValue) {
         if (senderBuilder_ == null) {
           sender_ = builderForValue.build();
-          onChanged();
         } else {
           senderBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -2205,31 +2146,32 @@ public Builder setSender(
       public Builder mergeSender(org.apache.pekko.remote.WireFormats.ActorRefData value) {
         if (senderBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
-              sender_ != null &&
-              sender_ != org.apache.pekko.remote.WireFormats.ActorRefData.getDefaultInstance()) {
-            sender_ =
-              org.apache.pekko.remote.WireFormats.ActorRefData.newBuilder(sender_).mergeFrom(value).buildPartial();
+            sender_ != null &&
+            sender_ != org.apache.pekko.remote.WireFormats.ActorRefData.getDefaultInstance()) {
+            getSenderBuilder().mergeFrom(value);
           } else {
             sender_ = value;
           }
-          onChanged();
         } else {
           senderBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000004;
+        if (sender_ != null) {
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .ActorRefData sender = 4;
        */
       public Builder clearSender() {
-        if (senderBuilder_ == null) {
-          sender_ = null;
-          onChanged();
-        } else {
-          senderBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000004);
+        sender_ = null;
+        if (senderBuilder_ != null) {
+          senderBuilder_.dispose();
+          senderBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -2273,6 +2215,7 @@ public org.apache.pekko.remote.WireFormats.ActorRefDataOrBuilder getSenderOrBuil
        * optional fixed64 seq = 5;
        * @return Whether the seq field is set.
        */
+      @java.lang.Override
       public boolean hasSeq() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -2280,6 +2223,7 @@ public boolean hasSeq() {
        * optional fixed64 seq = 5;
        * @return The seq.
        */
+      @java.lang.Override
       public long getSeq() {
         return seq_;
       }
@@ -2289,8 +2233,9 @@ public long getSeq() {
        * @return This builder for chaining.
        */
       public Builder setSeq(long value) {
-        bitField0_ |= 0x00000008;
+
         seq_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -2337,7 +2282,18 @@ public RemoteEnvelope parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new RemoteEnvelope(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -2392,7 +2348,7 @@ public interface AcknowledgementInfoOrBuilder extends
   /**
    * Protobuf type {@code AcknowledgementInfo}
    */
-  public  static final class AcknowledgementInfo extends
+  public static final class AcknowledgementInfo extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:AcknowledgementInfo)
       AcknowledgementInfoOrBuilder {
@@ -2412,78 +2368,6 @@ protected java.lang.Object newInstance(
       return new AcknowledgementInfo();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private AcknowledgementInfo(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 9: {
-              bitField0_ |= 0x00000001;
-              cumulativeAck_ = input.readFixed64();
-              break;
-            }
-            case 17: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                nacks_ = newLongList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              nacks_.addLong(input.readFixed64());
-              break;
-            }
-            case 18: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                nacks_ = newLongList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                nacks_.addLong(input.readFixed64());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          nacks_.makeImmutable(); // C
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.WireFormats.internal_static_AcknowledgementInfo_descriptor;
@@ -2499,11 +2383,12 @@ private AcknowledgementInfo(
 
     private int bitField0_;
     public static final int CUMULATIVEACK_FIELD_NUMBER = 1;
-    private long cumulativeAck_;
+    private long cumulativeAck_ = 0L;
     /**
      * required fixed64 cumulativeAck = 1;
      * @return Whether the cumulativeAck field is set.
      */
+    @java.lang.Override
     public boolean hasCumulativeAck() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -2511,16 +2396,20 @@ public boolean hasCumulativeAck() {
      * required fixed64 cumulativeAck = 1;
      * @return The cumulativeAck.
      */
+    @java.lang.Override
     public long getCumulativeAck() {
       return cumulativeAck_;
     }
 
     public static final int NACKS_FIELD_NUMBER = 2;
-    private org.apache.pekko.protobufv3.internal.Internal.LongList nacks_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.Internal.LongList nacks_ =
+        emptyLongList();
     /**
      * repeated fixed64 nacks = 2;
      * @return A list containing the nacks.
      */
+    @java.lang.Override
     public java.util.List
         getNacksList() {
       return nacks_;
@@ -2565,7 +2454,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < nacks_.size(); i++) {
         output.writeFixed64(2, nacks_.getLong(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -2584,7 +2473,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getNacksList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2606,7 +2495,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getNacksList()
           .equals(other.getNacksList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -2626,7 +2515,7 @@ public int hashCode() {
         hash = (37 * hash) + NACKS_FIELD_NUMBER;
         hash = (53 * hash) + getNacksList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -2675,11 +2564,13 @@ public static org.apache.pekko.remote.WireFormats.AcknowledgementInfo parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.WireFormats.AcknowledgementInfo parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.WireFormats.AcknowledgementInfo parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -2743,26 +2634,20 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.WireFormats.AcknowledgementInfo.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         cumulativeAck_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         nacks_ = emptyLongList();
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -2789,20 +2674,23 @@ public org.apache.pekko.remote.WireFormats.AcknowledgementInfo build() {
       @java.lang.Override
       public org.apache.pekko.remote.WireFormats.AcknowledgementInfo buildPartial() {
         org.apache.pekko.remote.WireFormats.AcknowledgementInfo result = new org.apache.pekko.remote.WireFormats.AcknowledgementInfo(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.WireFormats.AcknowledgementInfo result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.cumulativeAck_ = cumulativeAck_;
           to_bitField0_ |= 0x00000001;
         }
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((from_bitField0_ & 0x00000002) != 0)) {
           nacks_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          result.nacks_ = nacks_;
         }
-        result.nacks_ = nacks_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -2855,14 +2743,15 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.AcknowledgementInfo
         if (!other.nacks_.isEmpty()) {
           if (nacks_.isEmpty()) {
             nacks_ = other.nacks_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            nacks_.makeImmutable();
+            bitField0_ |= 0x00000002;
           } else {
             ensureNacksIsMutable();
             nacks_.addAll(other.nacks_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -2880,17 +2769,52 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.WireFormats.AcknowledgementInfo parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 9: {
+                cumulativeAck_ = input.readFixed64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 9
+              case 17: {
+                long v = input.readFixed64();
+                ensureNacksIsMutable();
+                nacks_.addLong(v);
+                break;
+              } // case 17
+              case 18: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureNacksIsMutable(alloc / 8);
+                while (input.getBytesUntilLimit() > 0) {
+                  nacks_.addLong(input.readFixed64());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.WireFormats.AcknowledgementInfo) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -2900,6 +2824,7 @@ public Builder mergeFrom(
        * required fixed64 cumulativeAck = 1;
        * @return Whether the cumulativeAck field is set.
        */
+      @java.lang.Override
       public boolean hasCumulativeAck() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -2907,6 +2832,7 @@ public boolean hasCumulativeAck() {
        * required fixed64 cumulativeAck = 1;
        * @return The cumulativeAck.
        */
+      @java.lang.Override
       public long getCumulativeAck() {
         return cumulativeAck_;
       }
@@ -2916,8 +2842,9 @@ public long getCumulativeAck() {
        * @return This builder for chaining.
        */
       public Builder setCumulativeAck(long value) {
-        bitField0_ |= 0x00000001;
+
         cumulativeAck_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2934,10 +2861,16 @@ public Builder clearCumulativeAck() {
 
       private org.apache.pekko.protobufv3.internal.Internal.LongList nacks_ = emptyLongList();
       private void ensureNacksIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          nacks_ = mutableCopy(nacks_);
-          bitField0_ |= 0x00000002;
-         }
+        if (!nacks_.isModifiable()) {
+          nacks_ = makeMutableCopy(nacks_);
+        }
+        bitField0_ |= 0x00000002;
+      }
+      private void ensureNacksIsMutable(int capacity) {
+        if (!nacks_.isModifiable()) {
+          nacks_ = makeMutableCopy(nacks_, capacity);
+        }
+        bitField0_ |= 0x00000002;
       }
       /**
        * repeated fixed64 nacks = 2;
@@ -2945,8 +2878,8 @@ private void ensureNacksIsMutable() {
        */
       public java.util.List
           getNacksList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(nacks_) : nacks_;
+        nacks_.makeImmutable();
+        return nacks_;
       }
       /**
        * repeated fixed64 nacks = 2;
@@ -2971,8 +2904,10 @@ public long getNacks(int index) {
        */
       public Builder setNacks(
           int index, long value) {
+
         ensureNacksIsMutable();
         nacks_.setLong(index, value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2982,8 +2917,10 @@ public Builder setNacks(
        * @return This builder for chaining.
        */
       public Builder addNacks(long value) {
+
         ensureNacksIsMutable();
         nacks_.addLong(value);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2997,6 +2934,7 @@ public Builder addAllNacks(
         ensureNacksIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, nacks_);
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -3043,7 +2981,18 @@ public AcknowledgementInfo parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new AcknowledgementInfo(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -3093,7 +3042,7 @@ public interface ActorRefDataOrBuilder extends
    *
    * Protobuf type {@code ActorRefData}
    */
-  public  static final class ActorRefData extends
+  public static final class ActorRefData extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ActorRefData)
       ActorRefDataOrBuilder {
@@ -3113,55 +3062,6 @@ protected java.lang.Object newInstance(
       return new ActorRefData();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ActorRefData(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              path_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.WireFormats.internal_static_ActorRefData_descriptor;
@@ -3177,11 +3077,13 @@ private ActorRefData(
 
     private int bitField0_;
     public static final int PATH_FIELD_NUMBER = 1;
-    private volatile java.lang.Object path_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object path_ = "";
     /**
      * required string path = 1;
      * @return Whether the path field is set.
      */
+    @java.lang.Override
     public boolean hasPath() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -3189,6 +3091,7 @@ public boolean hasPath() {
      * required string path = 1;
      * @return The path.
      */
+    @java.lang.Override
     public java.lang.String getPath() {
       java.lang.Object ref = path_;
       if (ref instanceof java.lang.String) {
@@ -3207,6 +3110,7 @@ public java.lang.String getPath() {
      * required string path = 1;
      * @return The bytes for path.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getPathBytes() {
       java.lang.Object ref = path_;
@@ -3242,7 +3146,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, path_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -3254,7 +3158,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000001) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, path_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -3274,7 +3178,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getPath()
             .equals(other.getPath())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -3289,7 +3193,7 @@ public int hashCode() {
         hash = (37 * hash) + PATH_FIELD_NUMBER;
         hash = (53 * hash) + getPath().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3338,11 +3242,13 @@ public static org.apache.pekko.remote.WireFormats.ActorRefData parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.WireFormats.ActorRefData parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.WireFormats.ActorRefData parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -3412,24 +3318,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.WireFormats.ActorRefData.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         path_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -3456,15 +3357,19 @@ public org.apache.pekko.remote.WireFormats.ActorRefData build() {
       @java.lang.Override
       public org.apache.pekko.remote.WireFormats.ActorRefData buildPartial() {
         org.apache.pekko.remote.WireFormats.ActorRefData result = new org.apache.pekko.remote.WireFormats.ActorRefData(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.WireFormats.ActorRefData result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.path_ = path_;
           to_bitField0_ |= 0x00000001;
         }
-        result.path_ = path_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -3512,11 +3417,11 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.remote.WireFormats.ActorRefData other) {
         if (other == org.apache.pekko.remote.WireFormats.ActorRefData.getDefaultInstance()) return this;
         if (other.hasPath()) {
-          bitField0_ |= 0x00000001;
           path_ = other.path_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -3534,17 +3439,35 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.WireFormats.ActorRefData parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                path_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.WireFormats.ActorRefData) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -3599,11 +3522,9 @@ public java.lang.String getPath() {
        */
       public Builder setPath(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         path_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -3612,8 +3533,8 @@ public Builder setPath(
        * @return This builder for chaining.
        */
       public Builder clearPath() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         path_ = getDefaultInstance().getPath();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -3624,11 +3545,9 @@ public Builder clearPath() {
        */
       public Builder setPathBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         path_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -3665,7 +3584,18 @@ public ActorRefData parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ActorRefData(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -3730,7 +3660,7 @@ public interface SerializedMessageOrBuilder extends
    *
    * Protobuf type {@code SerializedMessage}
    */
-  public  static final class SerializedMessage extends
+  public static final class SerializedMessage extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:SerializedMessage)
       SerializedMessageOrBuilder {
@@ -3751,64 +3681,6 @@ protected java.lang.Object newInstance(
       return new SerializedMessage();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private SerializedMessage(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              bitField0_ |= 0x00000001;
-              message_ = input.readBytes();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              serializerId_ = input.readInt32();
-              break;
-            }
-            case 26: {
-              bitField0_ |= 0x00000004;
-              messageManifest_ = input.readBytes();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.WireFormats.internal_static_SerializedMessage_descriptor;
@@ -3824,11 +3696,12 @@ private SerializedMessage(
 
     private int bitField0_;
     public static final int MESSAGE_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.ByteString message_;
+    private org.apache.pekko.protobufv3.internal.ByteString message_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * required bytes message = 1;
      * @return Whether the message field is set.
      */
+    @java.lang.Override
     public boolean hasMessage() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -3836,16 +3709,18 @@ public boolean hasMessage() {
      * required bytes message = 1;
      * @return The message.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getMessage() {
       return message_;
     }
 
     public static final int SERIALIZERID_FIELD_NUMBER = 2;
-    private int serializerId_;
+    private int serializerId_ = 0;
     /**
      * required int32 serializerId = 2;
      * @return Whether the serializerId field is set.
      */
+    @java.lang.Override
     public boolean hasSerializerId() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -3853,16 +3728,18 @@ public boolean hasSerializerId() {
      * required int32 serializerId = 2;
      * @return The serializerId.
      */
+    @java.lang.Override
     public int getSerializerId() {
       return serializerId_;
     }
 
     public static final int MESSAGEMANIFEST_FIELD_NUMBER = 3;
-    private org.apache.pekko.protobufv3.internal.ByteString messageManifest_;
+    private org.apache.pekko.protobufv3.internal.ByteString messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * optional bytes messageManifest = 3;
      * @return Whether the messageManifest field is set.
      */
+    @java.lang.Override
     public boolean hasMessageManifest() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -3870,6 +3747,7 @@ public boolean hasMessageManifest() {
      * optional bytes messageManifest = 3;
      * @return The messageManifest.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
       return messageManifest_;
     }
@@ -3905,7 +3783,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeBytes(3, messageManifest_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -3926,7 +3804,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(3, messageManifest_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -3956,7 +3834,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getMessageManifest()
             .equals(other.getMessageManifest())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -3979,7 +3857,7 @@ public int hashCode() {
         hash = (37 * hash) + MESSAGEMANIFEST_FIELD_NUMBER;
         hash = (53 * hash) + getMessageManifest().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4028,11 +3906,13 @@ public static org.apache.pekko.remote.WireFormats.SerializedMessage parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.WireFormats.SerializedMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.WireFormats.SerializedMessage parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -4101,28 +3981,21 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.WireFormats.SerializedMessage.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         message_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
         serializerId_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -4149,23 +4022,27 @@ public org.apache.pekko.remote.WireFormats.SerializedMessage build() {
       @java.lang.Override
       public org.apache.pekko.remote.WireFormats.SerializedMessage buildPartial() {
         org.apache.pekko.remote.WireFormats.SerializedMessage result = new org.apache.pekko.remote.WireFormats.SerializedMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.WireFormats.SerializedMessage result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.message_ = message_;
           to_bitField0_ |= 0x00000001;
         }
-        result.message_ = message_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.serializerId_ = serializerId_;
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.messageManifest_ = messageManifest_;
           to_bitField0_ |= 0x00000004;
         }
-        result.messageManifest_ = messageManifest_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -4221,7 +4098,7 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.SerializedMessage o
         if (other.hasMessageManifest()) {
           setMessageManifest(other.getMessageManifest());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -4242,17 +4119,45 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.WireFormats.SerializedMessage parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                message_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                serializerId_ = input.readInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 26: {
+                messageManifest_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.WireFormats.SerializedMessage) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -4262,6 +4167,7 @@ public Builder mergeFrom(
        * required bytes message = 1;
        * @return Whether the message field is set.
        */
+      @java.lang.Override
       public boolean hasMessage() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -4269,6 +4175,7 @@ public boolean hasMessage() {
        * required bytes message = 1;
        * @return The message.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getMessage() {
         return message_;
       }
@@ -4278,11 +4185,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getMessage() {
        * @return This builder for chaining.
        */
       public Builder setMessage(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         message_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4302,6 +4207,7 @@ public Builder clearMessage() {
        * required int32 serializerId = 2;
        * @return Whether the serializerId field is set.
        */
+      @java.lang.Override
       public boolean hasSerializerId() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -4309,6 +4215,7 @@ public boolean hasSerializerId() {
        * required int32 serializerId = 2;
        * @return The serializerId.
        */
+      @java.lang.Override
       public int getSerializerId() {
         return serializerId_;
       }
@@ -4318,8 +4225,9 @@ public int getSerializerId() {
        * @return This builder for chaining.
        */
       public Builder setSerializerId(int value) {
-        bitField0_ |= 0x00000002;
+
         serializerId_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4339,6 +4247,7 @@ public Builder clearSerializerId() {
        * optional bytes messageManifest = 3;
        * @return Whether the messageManifest field is set.
        */
+      @java.lang.Override
       public boolean hasMessageManifest() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -4346,6 +4255,7 @@ public boolean hasMessageManifest() {
        * optional bytes messageManifest = 3;
        * @return The messageManifest.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
         return messageManifest_;
       }
@@ -4355,11 +4265,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
        * @return This builder for chaining.
        */
       public Builder setMessageManifest(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         messageManifest_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -4406,7 +4314,18 @@ public SerializedMessage parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new SerializedMessage(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -4500,7 +4419,7 @@ public interface DaemonMsgCreateDataOrBuilder extends
    *
    * Protobuf type {@code DaemonMsgCreateData}
    */
-  public  static final class DaemonMsgCreateData extends
+  public static final class DaemonMsgCreateData extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:DaemonMsgCreateData)
       DaemonMsgCreateDataOrBuilder {
@@ -4520,94 +4439,6 @@ protected java.lang.Object newInstance(
       return new DaemonMsgCreateData();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private DaemonMsgCreateData(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.WireFormats.PropsData.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = props_.toBuilder();
-              }
-              props_ = input.readMessage(org.apache.pekko.remote.WireFormats.PropsData.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(props_);
-                props_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.remote.WireFormats.DeployData.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = deploy_.toBuilder();
-              }
-              deploy_ = input.readMessage(org.apache.pekko.remote.WireFormats.DeployData.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(deploy_);
-                deploy_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            case 26: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000004;
-              path_ = bs;
-              break;
-            }
-            case 34: {
-              org.apache.pekko.remote.WireFormats.ActorRefData.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000008) != 0)) {
-                subBuilder = supervisor_.toBuilder();
-              }
-              supervisor_ = input.readMessage(org.apache.pekko.remote.WireFormats.ActorRefData.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(supervisor_);
-                supervisor_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000008;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.WireFormats.internal_static_DaemonMsgCreateData_descriptor;
@@ -4628,6 +4459,7 @@ private DaemonMsgCreateData(
      * required .PropsData props = 1;
      * @return Whether the props field is set.
      */
+    @java.lang.Override
     public boolean hasProps() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -4635,12 +4467,14 @@ public boolean hasProps() {
      * required .PropsData props = 1;
      * @return The props.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.PropsData getProps() {
       return props_ == null ? org.apache.pekko.remote.WireFormats.PropsData.getDefaultInstance() : props_;
     }
     /**
      * required .PropsData props = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.PropsDataOrBuilder getPropsOrBuilder() {
       return props_ == null ? org.apache.pekko.remote.WireFormats.PropsData.getDefaultInstance() : props_;
     }
@@ -4651,6 +4485,7 @@ public org.apache.pekko.remote.WireFormats.PropsDataOrBuilder getPropsOrBuilder(
      * required .DeployData deploy = 2;
      * @return Whether the deploy field is set.
      */
+    @java.lang.Override
     public boolean hasDeploy() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -4658,22 +4493,26 @@ public boolean hasDeploy() {
      * required .DeployData deploy = 2;
      * @return The deploy.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.DeployData getDeploy() {
       return deploy_ == null ? org.apache.pekko.remote.WireFormats.DeployData.getDefaultInstance() : deploy_;
     }
     /**
      * required .DeployData deploy = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.DeployDataOrBuilder getDeployOrBuilder() {
       return deploy_ == null ? org.apache.pekko.remote.WireFormats.DeployData.getDefaultInstance() : deploy_;
     }
 
     public static final int PATH_FIELD_NUMBER = 3;
-    private volatile java.lang.Object path_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object path_ = "";
     /**
      * required string path = 3;
      * @return Whether the path field is set.
      */
+    @java.lang.Override
     public boolean hasPath() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -4681,6 +4520,7 @@ public boolean hasPath() {
      * required string path = 3;
      * @return The path.
      */
+    @java.lang.Override
     public java.lang.String getPath() {
       java.lang.Object ref = path_;
       if (ref instanceof java.lang.String) {
@@ -4699,6 +4539,7 @@ public java.lang.String getPath() {
      * required string path = 3;
      * @return The bytes for path.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getPathBytes() {
       java.lang.Object ref = path_;
@@ -4719,6 +4560,7 @@ public java.lang.String getPath() {
      * required .ActorRefData supervisor = 4;
      * @return Whether the supervisor field is set.
      */
+    @java.lang.Override
     public boolean hasSupervisor() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -4726,12 +4568,14 @@ public boolean hasSupervisor() {
      * required .ActorRefData supervisor = 4;
      * @return The supervisor.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.ActorRefData getSupervisor() {
       return supervisor_ == null ? org.apache.pekko.remote.WireFormats.ActorRefData.getDefaultInstance() : supervisor_;
     }
     /**
      * required .ActorRefData supervisor = 4;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.ActorRefDataOrBuilder getSupervisorOrBuilder() {
       return supervisor_ == null ? org.apache.pekko.remote.WireFormats.ActorRefData.getDefaultInstance() : supervisor_;
     }
@@ -4790,7 +4634,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeMessage(4, getSupervisor());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -4814,7 +4658,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(4, getSupervisor());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4849,7 +4693,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getSupervisor()
             .equals(other.getSupervisor())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -4876,7 +4720,7 @@ public int hashCode() {
         hash = (37 * hash) + SUPERVISOR_FIELD_NUMBER;
         hash = (53 * hash) + getSupervisor().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4925,11 +4769,13 @@ public static org.apache.pekko.remote.WireFormats.DaemonMsgCreateData parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.WireFormats.DaemonMsgCreateData parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.WireFormats.DaemonMsgCreateData parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -5017,26 +4863,23 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (propsBuilder_ == null) {
-          props_ = null;
-        } else {
-          propsBuilder_.clear();
+        bitField0_ = 0;
+        props_ = null;
+        if (propsBuilder_ != null) {
+          propsBuilder_.dispose();
+          propsBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (deployBuilder_ == null) {
-          deploy_ = null;
-        } else {
-          deployBuilder_.clear();
+        deploy_ = null;
+        if (deployBuilder_ != null) {
+          deployBuilder_.dispose();
+          deployBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         path_ = "";
-        bitField0_ = (bitField0_ & ~0x00000004);
-        if (supervisorBuilder_ == null) {
-          supervisor_ = null;
-        } else {
-          supervisorBuilder_.clear();
+        supervisor_ = null;
+        if (supervisorBuilder_ != null) {
+          supervisorBuilder_.dispose();
+          supervisorBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -5063,39 +4906,37 @@ public org.apache.pekko.remote.WireFormats.DaemonMsgCreateData build() {
       @java.lang.Override
       public org.apache.pekko.remote.WireFormats.DaemonMsgCreateData buildPartial() {
         org.apache.pekko.remote.WireFormats.DaemonMsgCreateData result = new org.apache.pekko.remote.WireFormats.DaemonMsgCreateData(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.WireFormats.DaemonMsgCreateData result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (propsBuilder_ == null) {
-            result.props_ = props_;
-          } else {
-            result.props_ = propsBuilder_.build();
-          }
+          result.props_ = propsBuilder_ == null
+              ? props_
+              : propsBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (deployBuilder_ == null) {
-            result.deploy_ = deploy_;
-          } else {
-            result.deploy_ = deployBuilder_.build();
-          }
+          result.deploy_ = deployBuilder_ == null
+              ? deploy_
+              : deployBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.path_ = path_;
           to_bitField0_ |= 0x00000004;
         }
-        result.path_ = path_;
         if (((from_bitField0_ & 0x00000008) != 0)) {
-          if (supervisorBuilder_ == null) {
-            result.supervisor_ = supervisor_;
-          } else {
-            result.supervisor_ = supervisorBuilder_.build();
-          }
+          result.supervisor_ = supervisorBuilder_ == null
+              ? supervisor_
+              : supervisorBuilder_.build();
           to_bitField0_ |= 0x00000008;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -5149,14 +4990,14 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.DaemonMsgCreateData
           mergeDeploy(other.getDeploy());
         }
         if (other.hasPath()) {
-          bitField0_ |= 0x00000004;
           path_ = other.path_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
         if (other.hasSupervisor()) {
           mergeSupervisor(other.getSupervisor());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -5192,17 +5033,56 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.WireFormats.DaemonMsgCreateData parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getPropsFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getDeployFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 26: {
+                path_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              case 34: {
+                input.readMessage(
+                    getSupervisorFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 34
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.WireFormats.DaemonMsgCreateData) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -5237,11 +5117,11 @@ public Builder setProps(org.apache.pekko.remote.WireFormats.PropsData value) {
             throw new NullPointerException();
           }
           props_ = value;
-          onChanged();
         } else {
           propsBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -5251,11 +5131,11 @@ public Builder setProps(
           org.apache.pekko.remote.WireFormats.PropsData.Builder builderForValue) {
         if (propsBuilder_ == null) {
           props_ = builderForValue.build();
-          onChanged();
         } else {
           propsBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -5264,31 +5144,32 @@ public Builder setProps(
       public Builder mergeProps(org.apache.pekko.remote.WireFormats.PropsData value) {
         if (propsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              props_ != null &&
-              props_ != org.apache.pekko.remote.WireFormats.PropsData.getDefaultInstance()) {
-            props_ =
-              org.apache.pekko.remote.WireFormats.PropsData.newBuilder(props_).mergeFrom(value).buildPartial();
+            props_ != null &&
+            props_ != org.apache.pekko.remote.WireFormats.PropsData.getDefaultInstance()) {
+            getPropsBuilder().mergeFrom(value);
           } else {
             props_ = value;
           }
-          onChanged();
         } else {
           propsBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (props_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .PropsData props = 1;
        */
       public Builder clearProps() {
-        if (propsBuilder_ == null) {
-          props_ = null;
-          onChanged();
-        } else {
-          propsBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        props_ = null;
+        if (propsBuilder_ != null) {
+          propsBuilder_.dispose();
+          propsBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -5357,11 +5238,11 @@ public Builder setDeploy(org.apache.pekko.remote.WireFormats.DeployData value) {
             throw new NullPointerException();
           }
           deploy_ = value;
-          onChanged();
         } else {
           deployBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -5371,11 +5252,11 @@ public Builder setDeploy(
           org.apache.pekko.remote.WireFormats.DeployData.Builder builderForValue) {
         if (deployBuilder_ == null) {
           deploy_ = builderForValue.build();
-          onChanged();
         } else {
           deployBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -5384,31 +5265,32 @@ public Builder setDeploy(
       public Builder mergeDeploy(org.apache.pekko.remote.WireFormats.DeployData value) {
         if (deployBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              deploy_ != null &&
-              deploy_ != org.apache.pekko.remote.WireFormats.DeployData.getDefaultInstance()) {
-            deploy_ =
-              org.apache.pekko.remote.WireFormats.DeployData.newBuilder(deploy_).mergeFrom(value).buildPartial();
+            deploy_ != null &&
+            deploy_ != org.apache.pekko.remote.WireFormats.DeployData.getDefaultInstance()) {
+            getDeployBuilder().mergeFrom(value);
           } else {
             deploy_ = value;
           }
-          onChanged();
         } else {
           deployBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (deploy_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .DeployData deploy = 2;
        */
       public Builder clearDeploy() {
-        if (deployBuilder_ == null) {
-          deploy_ = null;
-          onChanged();
-        } else {
-          deployBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        deploy_ = null;
+        if (deployBuilder_ != null) {
+          deployBuilder_.dispose();
+          deployBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -5497,11 +5379,9 @@ public java.lang.String getPath() {
        */
       public Builder setPath(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         path_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -5510,8 +5390,8 @@ public Builder setPath(
        * @return This builder for chaining.
        */
       public Builder clearPath() {
-        bitField0_ = (bitField0_ & ~0x00000004);
         path_ = getDefaultInstance().getPath();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -5522,11 +5402,9 @@ public Builder clearPath() {
        */
       public Builder setPathBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         path_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -5561,11 +5439,11 @@ public Builder setSupervisor(org.apache.pekko.remote.WireFormats.ActorRefData va
             throw new NullPointerException();
           }
           supervisor_ = value;
-          onChanged();
         } else {
           supervisorBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000008;
+        onChanged();
         return this;
       }
       /**
@@ -5575,11 +5453,11 @@ public Builder setSupervisor(
           org.apache.pekko.remote.WireFormats.ActorRefData.Builder builderForValue) {
         if (supervisorBuilder_ == null) {
           supervisor_ = builderForValue.build();
-          onChanged();
         } else {
           supervisorBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000008;
+        onChanged();
         return this;
       }
       /**
@@ -5588,31 +5466,32 @@ public Builder setSupervisor(
       public Builder mergeSupervisor(org.apache.pekko.remote.WireFormats.ActorRefData value) {
         if (supervisorBuilder_ == null) {
           if (((bitField0_ & 0x00000008) != 0) &&
-              supervisor_ != null &&
-              supervisor_ != org.apache.pekko.remote.WireFormats.ActorRefData.getDefaultInstance()) {
-            supervisor_ =
-              org.apache.pekko.remote.WireFormats.ActorRefData.newBuilder(supervisor_).mergeFrom(value).buildPartial();
+            supervisor_ != null &&
+            supervisor_ != org.apache.pekko.remote.WireFormats.ActorRefData.getDefaultInstance()) {
+            getSupervisorBuilder().mergeFrom(value);
           } else {
             supervisor_ = value;
           }
-          onChanged();
         } else {
           supervisorBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000008;
+        if (supervisor_ != null) {
+          bitField0_ |= 0x00000008;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .ActorRefData supervisor = 4;
        */
       public Builder clearSupervisor() {
-        if (supervisorBuilder_ == null) {
-          supervisor_ = null;
-          onChanged();
-        } else {
-          supervisorBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000008);
+        supervisor_ = null;
+        if (supervisorBuilder_ != null) {
+          supervisorBuilder_.dispose();
+          supervisorBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -5683,7 +5562,18 @@ public DaemonMsgCreateData parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new DaemonMsgCreateData(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -5874,7 +5764,7 @@ public interface PropsDataOrBuilder extends
    *
    * Protobuf type {@code PropsData}
    */
-  public  static final class PropsData extends
+  public static final class PropsData extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:PropsData)
       PropsDataOrBuilder {
@@ -5885,8 +5775,9 @@ private PropsData(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builde
     }
     private PropsData() {
       clazz_ = "";
-      args_ = java.util.Collections.emptyList();
-      manifests_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      args_ = emptyList(org.apache.pekko.protobufv3.internal.ByteString.class);
+      manifests_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       serializerIds_ = emptyIntList();
       hasManifest_ = emptyBooleanList();
     }
@@ -5898,139 +5789,6 @@ protected java.lang.Object newInstance(
       return new PropsData();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private PropsData(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 18: {
-              org.apache.pekko.remote.WireFormats.DeployData.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = deploy_.toBuilder();
-              }
-              deploy_ = input.readMessage(org.apache.pekko.remote.WireFormats.DeployData.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(deploy_);
-                deploy_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 26: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              clazz_ = bs;
-              break;
-            }
-            case 34: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                args_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              args_.add(input.readBytes());
-              break;
-            }
-            case 42: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                manifests_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              manifests_.add(bs);
-              break;
-            }
-            case 48: {
-              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
-                serializerIds_ = newIntList();
-                mutable_bitField0_ |= 0x00000010;
-              }
-              serializerIds_.addInt(input.readInt32());
-              break;
-            }
-            case 50: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000010) != 0) && input.getBytesUntilLimit() > 0) {
-                serializerIds_ = newIntList();
-                mutable_bitField0_ |= 0x00000010;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                serializerIds_.addInt(input.readInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 56: {
-              if (!((mutable_bitField0_ & 0x00000020) != 0)) {
-                hasManifest_ = newBooleanList();
-                mutable_bitField0_ |= 0x00000020;
-              }
-              hasManifest_.addBoolean(input.readBool());
-              break;
-            }
-            case 58: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000020) != 0) && input.getBytesUntilLimit() > 0) {
-                hasManifest_ = newBooleanList();
-                mutable_bitField0_ |= 0x00000020;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                hasManifest_.addBoolean(input.readBool());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          args_ = java.util.Collections.unmodifiableList(args_); // C
-        }
-        if (((mutable_bitField0_ & 0x00000008) != 0)) {
-          manifests_ = manifests_.getUnmodifiableView();
-        }
-        if (((mutable_bitField0_ & 0x00000010) != 0)) {
-          serializerIds_.makeImmutable(); // C
-        }
-        if (((mutable_bitField0_ & 0x00000020) != 0)) {
-          hasManifest_.makeImmutable(); // C
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.WireFormats.internal_static_PropsData_descriptor;
@@ -6051,6 +5809,7 @@ private PropsData(
      * required .DeployData deploy = 2;
      * @return Whether the deploy field is set.
      */
+    @java.lang.Override
     public boolean hasDeploy() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -6058,22 +5817,26 @@ public boolean hasDeploy() {
      * required .DeployData deploy = 2;
      * @return The deploy.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.DeployData getDeploy() {
       return deploy_ == null ? org.apache.pekko.remote.WireFormats.DeployData.getDefaultInstance() : deploy_;
     }
     /**
      * required .DeployData deploy = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.DeployDataOrBuilder getDeployOrBuilder() {
       return deploy_ == null ? org.apache.pekko.remote.WireFormats.DeployData.getDefaultInstance() : deploy_;
     }
 
     public static final int CLAZZ_FIELD_NUMBER = 3;
-    private volatile java.lang.Object clazz_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object clazz_ = "";
     /**
      * required string clazz = 3;
      * @return Whether the clazz field is set.
      */
+    @java.lang.Override
     public boolean hasClazz() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -6081,6 +5844,7 @@ public boolean hasClazz() {
      * required string clazz = 3;
      * @return The clazz.
      */
+    @java.lang.Override
     public java.lang.String getClazz() {
       java.lang.Object ref = clazz_;
       if (ref instanceof java.lang.String) {
@@ -6099,6 +5863,7 @@ public java.lang.String getClazz() {
      * required string clazz = 3;
      * @return The bytes for clazz.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getClazzBytes() {
       java.lang.Object ref = clazz_;
@@ -6114,11 +5879,14 @@ public java.lang.String getClazz() {
     }
 
     public static final int ARGS_FIELD_NUMBER = 4;
-    private java.util.List args_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.Internal.ProtobufList args_ =
+        emptyList(org.apache.pekko.protobufv3.internal.ByteString.class);
     /**
      * repeated bytes args = 4;
      * @return A list containing the args.
      */
+    @java.lang.Override
     public java.util.List
         getArgsList() {
       return args_;
@@ -6140,7 +5908,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getArgs(int index) {
     }
 
     public static final int MANIFESTS_FIELD_NUMBER = 5;
-    private org.apache.pekko.protobufv3.internal.LazyStringList manifests_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList manifests_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * 
      * serialized props parameters
@@ -6199,7 +5969,9 @@ public java.lang.String getManifests(int index) {
     }
 
     public static final int SERIALIZERIDS_FIELD_NUMBER = 6;
-    private org.apache.pekko.protobufv3.internal.Internal.IntList serializerIds_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.Internal.IntList serializerIds_ =
+        emptyIntList();
     /**
      * 
      * newer wire protocol: serializer id for each arg
@@ -6208,6 +5980,7 @@ public java.lang.String getManifests(int index) {
      * repeated int32 serializerIds = 6;
      * @return A list containing the serializerIds.
      */
+    @java.lang.Override
     public java.util.List
         getSerializerIdsList() {
       return serializerIds_;
@@ -6237,7 +6010,9 @@ public int getSerializerIds(int index) {
     }
 
     public static final int HASMANIFEST_FIELD_NUMBER = 7;
-    private org.apache.pekko.protobufv3.internal.Internal.BooleanList hasManifest_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.Internal.BooleanList hasManifest_ =
+        emptyBooleanList();
     /**
      * 
      * additionally a flag per position to indicate if it was
@@ -6247,6 +6022,7 @@ public int getSerializerIds(int index) {
      * repeated bool hasManifest = 7;
      * @return A list containing the hasManifest.
      */
+    @java.lang.Override
     public java.util.List
         getHasManifestList() {
       return hasManifest_;
@@ -6321,7 +6097,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < hasManifest_.size(); i++) {
         output.writeBool(7, hasManifest_.getBoolean(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -6369,7 +6145,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getHasManifestList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -6402,7 +6178,7 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getSerializerIdsList())) return false;
       if (!getHasManifestList()
           .equals(other.getHasManifestList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -6437,7 +6213,7 @@ public int hashCode() {
         hash = (37 * hash) + HASMANIFEST_FIELD_NUMBER;
         hash = (53 * hash) + getHasManifestList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -6486,11 +6262,13 @@ public static org.apache.pekko.remote.WireFormats.PropsData parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.WireFormats.PropsData parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.WireFormats.PropsData parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -6576,22 +6354,18 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (deployBuilder_ == null) {
-          deploy_ = null;
-        } else {
-          deployBuilder_.clear();
+        bitField0_ = 0;
+        deploy_ = null;
+        if (deployBuilder_ != null) {
+          deployBuilder_.dispose();
+          deployBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         clazz_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
-        args_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        manifests_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        args_ = emptyList(org.apache.pekko.protobufv3.internal.ByteString.class);
+        manifests_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         serializerIds_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000010);
         hasManifest_ = emptyBooleanList();
-        bitField0_ = (bitField0_ & ~0x00000020);
         return this;
       }
 
@@ -6618,43 +6392,41 @@ public org.apache.pekko.remote.WireFormats.PropsData build() {
       @java.lang.Override
       public org.apache.pekko.remote.WireFormats.PropsData buildPartial() {
         org.apache.pekko.remote.WireFormats.PropsData result = new org.apache.pekko.remote.WireFormats.PropsData(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.WireFormats.PropsData result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (deployBuilder_ == null) {
-            result.deploy_ = deploy_;
-          } else {
-            result.deploy_ = deployBuilder_.build();
-          }
+          result.deploy_ = deployBuilder_ == null
+              ? deploy_
+              : deployBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.clazz_ = clazz_;
           to_bitField0_ |= 0x00000002;
         }
-        result.clazz_ = clazz_;
-        if (((bitField0_ & 0x00000004) != 0)) {
-          args_ = java.util.Collections.unmodifiableList(args_);
-          bitField0_ = (bitField0_ & ~0x00000004);
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          args_.makeImmutable();
+          result.args_ = args_;
         }
-        result.args_ = args_;
-        if (((bitField0_ & 0x00000008) != 0)) {
-          manifests_ = manifests_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000008);
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          manifests_.makeImmutable();
+          result.manifests_ = manifests_;
         }
-        result.manifests_ = manifests_;
-        if (((bitField0_ & 0x00000010) != 0)) {
+        if (((from_bitField0_ & 0x00000010) != 0)) {
           serializerIds_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000010);
+          result.serializerIds_ = serializerIds_;
         }
-        result.serializerIds_ = serializerIds_;
-        if (((bitField0_ & 0x00000020) != 0)) {
+        if (((from_bitField0_ & 0x00000020) != 0)) {
           hasManifest_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000020);
+          result.hasManifest_ = hasManifest_;
         }
-        result.hasManifest_ = hasManifest_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -6705,14 +6477,15 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.PropsData other) {
           mergeDeploy(other.getDeploy());
         }
         if (other.hasClazz()) {
-          bitField0_ |= 0x00000002;
           clazz_ = other.clazz_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (!other.args_.isEmpty()) {
           if (args_.isEmpty()) {
             args_ = other.args_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            args_.makeImmutable();
+            bitField0_ |= 0x00000004;
           } else {
             ensureArgsIsMutable();
             args_.addAll(other.args_);
@@ -6722,7 +6495,7 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.PropsData other) {
         if (!other.manifests_.isEmpty()) {
           if (manifests_.isEmpty()) {
             manifests_ = other.manifests_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ |= 0x00000008;
           } else {
             ensureManifestsIsMutable();
             manifests_.addAll(other.manifests_);
@@ -6732,7 +6505,8 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.PropsData other) {
         if (!other.serializerIds_.isEmpty()) {
           if (serializerIds_.isEmpty()) {
             serializerIds_ = other.serializerIds_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            serializerIds_.makeImmutable();
+            bitField0_ |= 0x00000010;
           } else {
             ensureSerializerIdsIsMutable();
             serializerIds_.addAll(other.serializerIds_);
@@ -6742,14 +6516,15 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.PropsData other) {
         if (!other.hasManifest_.isEmpty()) {
           if (hasManifest_.isEmpty()) {
             hasManifest_ = other.hasManifest_;
-            bitField0_ = (bitField0_ & ~0x00000020);
+            hasManifest_.makeImmutable();
+            bitField0_ |= 0x00000020;
           } else {
             ensureHasManifestIsMutable();
             hasManifest_.addAll(other.hasManifest_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -6773,17 +6548,87 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.WireFormats.PropsData parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 18: {
+                input.readMessage(
+                    getDeployFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 18
+              case 26: {
+                clazz_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 26
+              case 34: {
+                org.apache.pekko.protobufv3.internal.ByteString v = input.readBytes();
+                ensureArgsIsMutable();
+                args_.add(v);
+                break;
+              } // case 34
+              case 42: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureManifestsIsMutable();
+                manifests_.add(bs);
+                break;
+              } // case 42
+              case 48: {
+                int v = input.readInt32();
+                ensureSerializerIdsIsMutable();
+                serializerIds_.addInt(v);
+                break;
+              } // case 48
+              case 50: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                ensureSerializerIdsIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  serializerIds_.addInt(input.readInt32());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 50
+              case 56: {
+                boolean v = input.readBool();
+                ensureHasManifestIsMutable();
+                hasManifest_.addBoolean(v);
+                break;
+              } // case 56
+              case 58: {
+                int length = input.readRawVarint32();
+                int limit = input.pushLimit(length);
+                int alloc = length > 4096 ? 4096 : length;
+                ensureHasManifestIsMutable(alloc / 1);
+                while (input.getBytesUntilLimit() > 0) {
+                  hasManifest_.addBoolean(input.readBool());
+                }
+                input.popLimit(limit);
+                break;
+              } // case 58
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.WireFormats.PropsData) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -6818,11 +6663,11 @@ public Builder setDeploy(org.apache.pekko.remote.WireFormats.DeployData value) {
             throw new NullPointerException();
           }
           deploy_ = value;
-          onChanged();
         } else {
           deployBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -6832,11 +6677,11 @@ public Builder setDeploy(
           org.apache.pekko.remote.WireFormats.DeployData.Builder builderForValue) {
         if (deployBuilder_ == null) {
           deploy_ = builderForValue.build();
-          onChanged();
         } else {
           deployBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -6845,31 +6690,32 @@ public Builder setDeploy(
       public Builder mergeDeploy(org.apache.pekko.remote.WireFormats.DeployData value) {
         if (deployBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              deploy_ != null &&
-              deploy_ != org.apache.pekko.remote.WireFormats.DeployData.getDefaultInstance()) {
-            deploy_ =
-              org.apache.pekko.remote.WireFormats.DeployData.newBuilder(deploy_).mergeFrom(value).buildPartial();
+            deploy_ != null &&
+            deploy_ != org.apache.pekko.remote.WireFormats.DeployData.getDefaultInstance()) {
+            getDeployBuilder().mergeFrom(value);
           } else {
             deploy_ = value;
           }
-          onChanged();
         } else {
           deployBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (deploy_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .DeployData deploy = 2;
        */
       public Builder clearDeploy() {
-        if (deployBuilder_ == null) {
-          deploy_ = null;
-          onChanged();
-        } else {
-          deployBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        deploy_ = null;
+        if (deployBuilder_ != null) {
+          deployBuilder_.dispose();
+          deployBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -6958,11 +6804,9 @@ public java.lang.String getClazz() {
        */
       public Builder setClazz(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         clazz_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -6971,8 +6815,8 @@ public Builder setClazz(
        * @return This builder for chaining.
        */
       public Builder clearClazz() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         clazz_ = getDefaultInstance().getClazz();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -6983,21 +6827,19 @@ public Builder clearClazz() {
        */
       public Builder setClazzBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         clazz_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
 
-      private java.util.List args_ = java.util.Collections.emptyList();
+      private org.apache.pekko.protobufv3.internal.Internal.ProtobufList args_ = emptyList(org.apache.pekko.protobufv3.internal.ByteString.class);
       private void ensureArgsIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
-          args_ = new java.util.ArrayList(args_);
-          bitField0_ |= 0x00000004;
-         }
+        if (!args_.isModifiable()) {
+          args_ = makeMutableCopy(args_);
+        }
+        bitField0_ |= 0x00000004;
       }
       /**
        * repeated bytes args = 4;
@@ -7005,8 +6847,8 @@ private void ensureArgsIsMutable() {
        */
       public java.util.List
           getArgsList() {
-        return ((bitField0_ & 0x00000004) != 0) ?
-                 java.util.Collections.unmodifiableList(args_) : args_;
+        args_.makeImmutable();
+        return args_;
       }
       /**
        * repeated bytes args = 4;
@@ -7031,11 +6873,10 @@ public org.apache.pekko.protobufv3.internal.ByteString getArgs(int index) {
        */
       public Builder setArgs(
           int index, org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureArgsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureArgsIsMutable();
         args_.set(index, value);
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -7045,11 +6886,10 @@ public Builder setArgs(
        * @return This builder for chaining.
        */
       public Builder addArgs(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureArgsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureArgsIsMutable();
         args_.add(value);
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -7063,6 +6903,7 @@ public Builder addAllArgs(
         ensureArgsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, args_);
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -7071,18 +6912,19 @@ public Builder addAllArgs(
        * @return This builder for chaining.
        */
       public Builder clearArgs() {
-        args_ = java.util.Collections.emptyList();
+        args_ = emptyList(org.apache.pekko.protobufv3.internal.ByteString.class);
         bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList manifests_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList manifests_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureManifestsIsMutable() {
-        if (!((bitField0_ & 0x00000008) != 0)) {
+        if (!manifests_.isModifiable()) {
           manifests_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(manifests_);
-          bitField0_ |= 0x00000008;
-         }
+        }
+        bitField0_ |= 0x00000008;
       }
       /**
        * 
@@ -7096,7 +6938,8 @@ private void ensureManifestsIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getManifestsList() {
-        return manifests_.getUnmodifiableView();
+        manifests_.makeImmutable();
+        return manifests_;
       }
       /**
        * 
@@ -7154,11 +6997,10 @@ public java.lang.String getManifests(int index) {
        */
       public Builder setManifests(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureManifestsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureManifestsIsMutable();
         manifests_.set(index, value);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -7175,11 +7017,10 @@ public Builder setManifests(
        */
       public Builder addManifests(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureManifestsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureManifestsIsMutable();
         manifests_.add(value);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -7199,6 +7040,7 @@ public Builder addAllManifests(
         ensureManifestsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, manifests_);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -7213,8 +7055,9 @@ public Builder addAllManifests(
        * @return This builder for chaining.
        */
       public Builder clearManifests() {
-        manifests_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        manifests_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000008);;
         onChanged();
         return this;
       }
@@ -7231,21 +7074,20 @@ public Builder clearManifests() {
        */
       public Builder addManifestsBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureManifestsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureManifestsIsMutable();
         manifests_.add(value);
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
 
       private org.apache.pekko.protobufv3.internal.Internal.IntList serializerIds_ = emptyIntList();
       private void ensureSerializerIdsIsMutable() {
-        if (!((bitField0_ & 0x00000010) != 0)) {
-          serializerIds_ = mutableCopy(serializerIds_);
-          bitField0_ |= 0x00000010;
-         }
+        if (!serializerIds_.isModifiable()) {
+          serializerIds_ = makeMutableCopy(serializerIds_);
+        }
+        bitField0_ |= 0x00000010;
       }
       /**
        * 
@@ -7257,8 +7099,8 @@ private void ensureSerializerIdsIsMutable() {
        */
       public java.util.List
           getSerializerIdsList() {
-        return ((bitField0_ & 0x00000010) != 0) ?
-                 java.util.Collections.unmodifiableList(serializerIds_) : serializerIds_;
+        serializerIds_.makeImmutable();
+        return serializerIds_;
       }
       /**
        * 
@@ -7295,8 +7137,10 @@ public int getSerializerIds(int index) {
        */
       public Builder setSerializerIds(
           int index, int value) {
+
         ensureSerializerIdsIsMutable();
         serializerIds_.setInt(index, value);
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -7310,8 +7154,10 @@ public Builder setSerializerIds(
        * @return This builder for chaining.
        */
       public Builder addSerializerIds(int value) {
+
         ensureSerializerIdsIsMutable();
         serializerIds_.addInt(value);
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -7329,6 +7175,7 @@ public Builder addAllSerializerIds(
         ensureSerializerIdsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, serializerIds_);
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -7349,10 +7196,16 @@ public Builder clearSerializerIds() {
 
       private org.apache.pekko.protobufv3.internal.Internal.BooleanList hasManifest_ = emptyBooleanList();
       private void ensureHasManifestIsMutable() {
-        if (!((bitField0_ & 0x00000020) != 0)) {
-          hasManifest_ = mutableCopy(hasManifest_);
-          bitField0_ |= 0x00000020;
-         }
+        if (!hasManifest_.isModifiable()) {
+          hasManifest_ = makeMutableCopy(hasManifest_);
+        }
+        bitField0_ |= 0x00000020;
+      }
+      private void ensureHasManifestIsMutable(int capacity) {
+        if (!hasManifest_.isModifiable()) {
+          hasManifest_ = makeMutableCopy(hasManifest_, capacity);
+        }
+        bitField0_ |= 0x00000020;
       }
       /**
        * 
@@ -7365,8 +7218,8 @@ private void ensureHasManifestIsMutable() {
        */
       public java.util.List
           getHasManifestList() {
-        return ((bitField0_ & 0x00000020) != 0) ?
-                 java.util.Collections.unmodifiableList(hasManifest_) : hasManifest_;
+        hasManifest_.makeImmutable();
+        return hasManifest_;
       }
       /**
        * 
@@ -7406,8 +7259,10 @@ public boolean getHasManifest(int index) {
        */
       public Builder setHasManifest(
           int index, boolean value) {
+
         ensureHasManifestIsMutable();
         hasManifest_.setBoolean(index, value);
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -7422,8 +7277,10 @@ public Builder setHasManifest(
        * @return This builder for chaining.
        */
       public Builder addHasManifest(boolean value) {
+
         ensureHasManifestIsMutable();
         hasManifest_.addBoolean(value);
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -7442,6 +7299,7 @@ public Builder addAllHasManifest(
         ensureHasManifestIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, hasManifest_);
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -7493,7 +7351,18 @@ public PropsData parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new PropsData(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -7711,7 +7580,7 @@ public interface DeployDataOrBuilder extends
    *
    * Protobuf type {@code DeployData}
    */
-  public  static final class DeployData extends
+  public static final class DeployData extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:DeployData)
       DeployDataOrBuilder {
@@ -7729,7 +7598,8 @@ private DeployData() {
       scopeManifest_ = "";
       configManifest_ = "";
       routerConfigManifest_ = "";
-      tags_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      tags_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -7739,121 +7609,6 @@ protected java.lang.Object newInstance(
       return new DeployData();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private DeployData(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              path_ = bs;
-              break;
-            }
-            case 18: {
-              bitField0_ |= 0x00000002;
-              config_ = input.readBytes();
-              break;
-            }
-            case 26: {
-              bitField0_ |= 0x00000004;
-              routerConfig_ = input.readBytes();
-              break;
-            }
-            case 34: {
-              bitField0_ |= 0x00000008;
-              scope_ = input.readBytes();
-              break;
-            }
-            case 42: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000010;
-              dispatcher_ = bs;
-              break;
-            }
-            case 48: {
-              bitField0_ |= 0x00000020;
-              scopeSerializerId_ = input.readInt32();
-              break;
-            }
-            case 58: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000040;
-              scopeManifest_ = bs;
-              break;
-            }
-            case 64: {
-              bitField0_ |= 0x00000080;
-              configSerializerId_ = input.readInt32();
-              break;
-            }
-            case 74: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000100;
-              configManifest_ = bs;
-              break;
-            }
-            case 80: {
-              bitField0_ |= 0x00000200;
-              routerConfigSerializerId_ = input.readInt32();
-              break;
-            }
-            case 90: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000400;
-              routerConfigManifest_ = bs;
-              break;
-            }
-            case 98: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000800) != 0)) {
-                tags_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000800;
-              }
-              tags_.add(bs);
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000800) != 0)) {
-          tags_ = tags_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.WireFormats.internal_static_DeployData_descriptor;
@@ -7869,11 +7624,13 @@ private DeployData(
 
     private int bitField0_;
     public static final int PATH_FIELD_NUMBER = 1;
-    private volatile java.lang.Object path_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object path_ = "";
     /**
      * required string path = 1;
      * @return Whether the path field is set.
      */
+    @java.lang.Override
     public boolean hasPath() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -7881,6 +7638,7 @@ public boolean hasPath() {
      * required string path = 1;
      * @return The path.
      */
+    @java.lang.Override
     public java.lang.String getPath() {
       java.lang.Object ref = path_;
       if (ref instanceof java.lang.String) {
@@ -7899,6 +7657,7 @@ public java.lang.String getPath() {
      * required string path = 1;
      * @return The bytes for path.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getPathBytes() {
       java.lang.Object ref = path_;
@@ -7914,11 +7673,12 @@ public java.lang.String getPath() {
     }
 
     public static final int CONFIG_FIELD_NUMBER = 2;
-    private org.apache.pekko.protobufv3.internal.ByteString config_;
+    private org.apache.pekko.protobufv3.internal.ByteString config_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * optional bytes config = 2;
      * @return Whether the config field is set.
      */
+    @java.lang.Override
     public boolean hasConfig() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -7926,16 +7686,18 @@ public boolean hasConfig() {
      * optional bytes config = 2;
      * @return The config.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getConfig() {
       return config_;
     }
 
     public static final int ROUTERCONFIG_FIELD_NUMBER = 3;
-    private org.apache.pekko.protobufv3.internal.ByteString routerConfig_;
+    private org.apache.pekko.protobufv3.internal.ByteString routerConfig_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * optional bytes routerConfig = 3;
      * @return Whether the routerConfig field is set.
      */
+    @java.lang.Override
     public boolean hasRouterConfig() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -7943,16 +7705,18 @@ public boolean hasRouterConfig() {
      * optional bytes routerConfig = 3;
      * @return The routerConfig.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getRouterConfig() {
       return routerConfig_;
     }
 
     public static final int SCOPE_FIELD_NUMBER = 4;
-    private org.apache.pekko.protobufv3.internal.ByteString scope_;
+    private org.apache.pekko.protobufv3.internal.ByteString scope_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * optional bytes scope = 4;
      * @return Whether the scope field is set.
      */
+    @java.lang.Override
     public boolean hasScope() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -7960,16 +7724,19 @@ public boolean hasScope() {
      * optional bytes scope = 4;
      * @return The scope.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getScope() {
       return scope_;
     }
 
     public static final int DISPATCHER_FIELD_NUMBER = 5;
-    private volatile java.lang.Object dispatcher_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object dispatcher_ = "";
     /**
      * optional string dispatcher = 5;
      * @return Whether the dispatcher field is set.
      */
+    @java.lang.Override
     public boolean hasDispatcher() {
       return ((bitField0_ & 0x00000010) != 0);
     }
@@ -7977,6 +7744,7 @@ public boolean hasDispatcher() {
      * optional string dispatcher = 5;
      * @return The dispatcher.
      */
+    @java.lang.Override
     public java.lang.String getDispatcher() {
       java.lang.Object ref = dispatcher_;
       if (ref instanceof java.lang.String) {
@@ -7995,6 +7763,7 @@ public java.lang.String getDispatcher() {
      * optional string dispatcher = 5;
      * @return The bytes for dispatcher.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getDispatcherBytes() {
       java.lang.Object ref = dispatcher_;
@@ -8010,7 +7779,7 @@ public java.lang.String getDispatcher() {
     }
 
     public static final int SCOPESERIALIZERID_FIELD_NUMBER = 6;
-    private int scopeSerializerId_;
+    private int scopeSerializerId_ = 0;
     /**
      * 
      * older wire protocol: hardcoded class used to look up serializer
@@ -8020,6 +7789,7 @@ public java.lang.String getDispatcher() {
      * optional int32 scopeSerializerId = 6;
      * @return Whether the scopeSerializerId field is set.
      */
+    @java.lang.Override
     public boolean hasScopeSerializerId() {
       return ((bitField0_ & 0x00000020) != 0);
     }
@@ -8032,16 +7802,19 @@ public boolean hasScopeSerializerId() {
      * optional int32 scopeSerializerId = 6;
      * @return The scopeSerializerId.
      */
+    @java.lang.Override
     public int getScopeSerializerId() {
       return scopeSerializerId_;
     }
 
     public static final int SCOPEMANIFEST_FIELD_NUMBER = 7;
-    private volatile java.lang.Object scopeManifest_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object scopeManifest_ = "";
     /**
      * optional string scopeManifest = 7;
      * @return Whether the scopeManifest field is set.
      */
+    @java.lang.Override
     public boolean hasScopeManifest() {
       return ((bitField0_ & 0x00000040) != 0);
     }
@@ -8049,6 +7822,7 @@ public boolean hasScopeManifest() {
      * optional string scopeManifest = 7;
      * @return The scopeManifest.
      */
+    @java.lang.Override
     public java.lang.String getScopeManifest() {
       java.lang.Object ref = scopeManifest_;
       if (ref instanceof java.lang.String) {
@@ -8067,6 +7841,7 @@ public java.lang.String getScopeManifest() {
      * optional string scopeManifest = 7;
      * @return The bytes for scopeManifest.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getScopeManifestBytes() {
       java.lang.Object ref = scopeManifest_;
@@ -8082,11 +7857,12 @@ public java.lang.String getScopeManifest() {
     }
 
     public static final int CONFIGSERIALIZERID_FIELD_NUMBER = 8;
-    private int configSerializerId_;
+    private int configSerializerId_ = 0;
     /**
      * optional int32 configSerializerId = 8;
      * @return Whether the configSerializerId field is set.
      */
+    @java.lang.Override
     public boolean hasConfigSerializerId() {
       return ((bitField0_ & 0x00000080) != 0);
     }
@@ -8094,16 +7870,19 @@ public boolean hasConfigSerializerId() {
      * optional int32 configSerializerId = 8;
      * @return The configSerializerId.
      */
+    @java.lang.Override
     public int getConfigSerializerId() {
       return configSerializerId_;
     }
 
     public static final int CONFIGMANIFEST_FIELD_NUMBER = 9;
-    private volatile java.lang.Object configManifest_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object configManifest_ = "";
     /**
      * optional string configManifest = 9;
      * @return Whether the configManifest field is set.
      */
+    @java.lang.Override
     public boolean hasConfigManifest() {
       return ((bitField0_ & 0x00000100) != 0);
     }
@@ -8111,6 +7890,7 @@ public boolean hasConfigManifest() {
      * optional string configManifest = 9;
      * @return The configManifest.
      */
+    @java.lang.Override
     public java.lang.String getConfigManifest() {
       java.lang.Object ref = configManifest_;
       if (ref instanceof java.lang.String) {
@@ -8129,6 +7909,7 @@ public java.lang.String getConfigManifest() {
      * optional string configManifest = 9;
      * @return The bytes for configManifest.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getConfigManifestBytes() {
       java.lang.Object ref = configManifest_;
@@ -8144,11 +7925,12 @@ public java.lang.String getConfigManifest() {
     }
 
     public static final int ROUTERCONFIGSERIALIZERID_FIELD_NUMBER = 10;
-    private int routerConfigSerializerId_;
+    private int routerConfigSerializerId_ = 0;
     /**
      * optional int32 routerConfigSerializerId = 10;
      * @return Whether the routerConfigSerializerId field is set.
      */
+    @java.lang.Override
     public boolean hasRouterConfigSerializerId() {
       return ((bitField0_ & 0x00000200) != 0);
     }
@@ -8156,16 +7938,19 @@ public boolean hasRouterConfigSerializerId() {
      * optional int32 routerConfigSerializerId = 10;
      * @return The routerConfigSerializerId.
      */
+    @java.lang.Override
     public int getRouterConfigSerializerId() {
       return routerConfigSerializerId_;
     }
 
     public static final int ROUTERCONFIGMANIFEST_FIELD_NUMBER = 11;
-    private volatile java.lang.Object routerConfigManifest_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object routerConfigManifest_ = "";
     /**
      * optional string routerConfigManifest = 11;
      * @return Whether the routerConfigManifest field is set.
      */
+    @java.lang.Override
     public boolean hasRouterConfigManifest() {
       return ((bitField0_ & 0x00000400) != 0);
     }
@@ -8173,6 +7958,7 @@ public boolean hasRouterConfigManifest() {
      * optional string routerConfigManifest = 11;
      * @return The routerConfigManifest.
      */
+    @java.lang.Override
     public java.lang.String getRouterConfigManifest() {
       java.lang.Object ref = routerConfigManifest_;
       if (ref instanceof java.lang.String) {
@@ -8191,6 +7977,7 @@ public java.lang.String getRouterConfigManifest() {
      * optional string routerConfigManifest = 11;
      * @return The bytes for routerConfigManifest.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getRouterConfigManifestBytes() {
       java.lang.Object ref = routerConfigManifest_;
@@ -8206,7 +7993,9 @@ public java.lang.String getRouterConfigManifest() {
     }
 
     public static final int TAGS_FIELD_NUMBER = 12;
-    private org.apache.pekko.protobufv3.internal.LazyStringList tags_;
+    @SuppressWarnings("serial")
+    private org.apache.pekko.protobufv3.internal.LazyStringArrayList tags_ =
+        org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     /**
      * repeated string tags = 12;
      * @return A list containing the tags.
@@ -8294,7 +8083,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < tags_.size(); i++) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 12, tags_.getRaw(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -8350,7 +8139,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getTagsList().size();
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -8422,7 +8211,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getTagsList()
           .equals(other.getTagsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -8481,7 +8270,7 @@ public int hashCode() {
         hash = (37 * hash) + TAGS_FIELD_NUMBER;
         hash = (53 * hash) + getTagsList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -8530,11 +8319,13 @@ public static org.apache.pekko.remote.WireFormats.DeployData parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.WireFormats.DeployData parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.WireFormats.DeployData parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -8603,46 +8394,31 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.WireFormats.DeployData.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         path_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         config_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000002);
         routerConfig_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000004);
         scope_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000008);
         dispatcher_ = "";
-        bitField0_ = (bitField0_ & ~0x00000010);
         scopeSerializerId_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000020);
         scopeManifest_ = "";
-        bitField0_ = (bitField0_ & ~0x00000040);
         configSerializerId_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000080);
         configManifest_ = "";
-        bitField0_ = (bitField0_ & ~0x00000100);
         routerConfigSerializerId_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000200);
         routerConfigManifest_ = "";
-        bitField0_ = (bitField0_ & ~0x00000400);
-        tags_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000800);
+        tags_ =
+            org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         return this;
       }
 
@@ -8669,60 +8445,63 @@ public org.apache.pekko.remote.WireFormats.DeployData build() {
       @java.lang.Override
       public org.apache.pekko.remote.WireFormats.DeployData buildPartial() {
         org.apache.pekko.remote.WireFormats.DeployData result = new org.apache.pekko.remote.WireFormats.DeployData(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.WireFormats.DeployData result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.path_ = path_;
           to_bitField0_ |= 0x00000001;
         }
-        result.path_ = path_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.config_ = config_;
           to_bitField0_ |= 0x00000002;
         }
-        result.config_ = config_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.routerConfig_ = routerConfig_;
           to_bitField0_ |= 0x00000004;
         }
-        result.routerConfig_ = routerConfig_;
         if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.scope_ = scope_;
           to_bitField0_ |= 0x00000008;
         }
-        result.scope_ = scope_;
         if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.dispatcher_ = dispatcher_;
           to_bitField0_ |= 0x00000010;
         }
-        result.dispatcher_ = dispatcher_;
         if (((from_bitField0_ & 0x00000020) != 0)) {
           result.scopeSerializerId_ = scopeSerializerId_;
           to_bitField0_ |= 0x00000020;
         }
         if (((from_bitField0_ & 0x00000040) != 0)) {
+          result.scopeManifest_ = scopeManifest_;
           to_bitField0_ |= 0x00000040;
         }
-        result.scopeManifest_ = scopeManifest_;
         if (((from_bitField0_ & 0x00000080) != 0)) {
           result.configSerializerId_ = configSerializerId_;
           to_bitField0_ |= 0x00000080;
         }
         if (((from_bitField0_ & 0x00000100) != 0)) {
+          result.configManifest_ = configManifest_;
           to_bitField0_ |= 0x00000100;
         }
-        result.configManifest_ = configManifest_;
         if (((from_bitField0_ & 0x00000200) != 0)) {
           result.routerConfigSerializerId_ = routerConfigSerializerId_;
           to_bitField0_ |= 0x00000200;
         }
         if (((from_bitField0_ & 0x00000400) != 0)) {
+          result.routerConfigManifest_ = routerConfigManifest_;
           to_bitField0_ |= 0x00000400;
         }
-        result.routerConfigManifest_ = routerConfigManifest_;
-        if (((bitField0_ & 0x00000800) != 0)) {
-          tags_ = tags_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000800);
+        if (((from_bitField0_ & 0x00000800) != 0)) {
+          tags_.makeImmutable();
+          result.tags_ = tags_;
         }
-        result.tags_ = tags_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -8770,8 +8549,8 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.remote.WireFormats.DeployData other) {
         if (other == org.apache.pekko.remote.WireFormats.DeployData.getDefaultInstance()) return this;
         if (other.hasPath()) {
-          bitField0_ |= 0x00000001;
           path_ = other.path_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasConfig()) {
@@ -8784,45 +8563,45 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.DeployData other) {
           setScope(other.getScope());
         }
         if (other.hasDispatcher()) {
-          bitField0_ |= 0x00000010;
           dispatcher_ = other.dispatcher_;
+          bitField0_ |= 0x00000010;
           onChanged();
         }
         if (other.hasScopeSerializerId()) {
           setScopeSerializerId(other.getScopeSerializerId());
         }
         if (other.hasScopeManifest()) {
-          bitField0_ |= 0x00000040;
           scopeManifest_ = other.scopeManifest_;
+          bitField0_ |= 0x00000040;
           onChanged();
         }
         if (other.hasConfigSerializerId()) {
           setConfigSerializerId(other.getConfigSerializerId());
         }
         if (other.hasConfigManifest()) {
-          bitField0_ |= 0x00000100;
           configManifest_ = other.configManifest_;
+          bitField0_ |= 0x00000100;
           onChanged();
         }
         if (other.hasRouterConfigSerializerId()) {
           setRouterConfigSerializerId(other.getRouterConfigSerializerId());
         }
         if (other.hasRouterConfigManifest()) {
-          bitField0_ |= 0x00000400;
           routerConfigManifest_ = other.routerConfigManifest_;
+          bitField0_ |= 0x00000400;
           onChanged();
         }
         if (!other.tags_.isEmpty()) {
           if (tags_.isEmpty()) {
             tags_ = other.tags_;
-            bitField0_ = (bitField0_ & ~0x00000800);
+            bitField0_ |= 0x00000800;
           } else {
             ensureTagsIsMutable();
             tags_.addAll(other.tags_);
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -8840,17 +8619,91 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.WireFormats.DeployData parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                path_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                config_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 26: {
+                routerConfig_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              case 34: {
+                scope_ = input.readBytes();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 34
+              case 42: {
+                dispatcher_ = input.readBytes();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 42
+              case 48: {
+                scopeSerializerId_ = input.readInt32();
+                bitField0_ |= 0x00000020;
+                break;
+              } // case 48
+              case 58: {
+                scopeManifest_ = input.readBytes();
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 58
+              case 64: {
+                configSerializerId_ = input.readInt32();
+                bitField0_ |= 0x00000080;
+                break;
+              } // case 64
+              case 74: {
+                configManifest_ = input.readBytes();
+                bitField0_ |= 0x00000100;
+                break;
+              } // case 74
+              case 80: {
+                routerConfigSerializerId_ = input.readInt32();
+                bitField0_ |= 0x00000200;
+                break;
+              } // case 80
+              case 90: {
+                routerConfigManifest_ = input.readBytes();
+                bitField0_ |= 0x00000400;
+                break;
+              } // case 90
+              case 98: {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                ensureTagsIsMutable();
+                tags_.add(bs);
+                break;
+              } // case 98
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.WireFormats.DeployData) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -8905,11 +8758,9 @@ public java.lang.String getPath() {
        */
       public Builder setPath(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         path_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8918,8 +8769,8 @@ public Builder setPath(
        * @return This builder for chaining.
        */
       public Builder clearPath() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         path_ = getDefaultInstance().getPath();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -8930,11 +8781,9 @@ public Builder clearPath() {
        */
       public Builder setPathBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         path_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8944,6 +8793,7 @@ public Builder setPathBytes(
        * optional bytes config = 2;
        * @return Whether the config field is set.
        */
+      @java.lang.Override
       public boolean hasConfig() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -8951,6 +8801,7 @@ public boolean hasConfig() {
        * optional bytes config = 2;
        * @return The config.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getConfig() {
         return config_;
       }
@@ -8960,11 +8811,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getConfig() {
        * @return This builder for chaining.
        */
       public Builder setConfig(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         config_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -8984,6 +8833,7 @@ public Builder clearConfig() {
        * optional bytes routerConfig = 3;
        * @return Whether the routerConfig field is set.
        */
+      @java.lang.Override
       public boolean hasRouterConfig() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -8991,6 +8841,7 @@ public boolean hasRouterConfig() {
        * optional bytes routerConfig = 3;
        * @return The routerConfig.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getRouterConfig() {
         return routerConfig_;
       }
@@ -9000,11 +8851,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getRouterConfig() {
        * @return This builder for chaining.
        */
       public Builder setRouterConfig(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         routerConfig_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -9024,6 +8873,7 @@ public Builder clearRouterConfig() {
        * optional bytes scope = 4;
        * @return Whether the scope field is set.
        */
+      @java.lang.Override
       public boolean hasScope() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -9031,6 +8881,7 @@ public boolean hasScope() {
        * optional bytes scope = 4;
        * @return The scope.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getScope() {
         return scope_;
       }
@@ -9040,11 +8891,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getScope() {
        * @return This builder for chaining.
        */
       public Builder setScope(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
+        if (value == null) { throw new NullPointerException(); }
         scope_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -9109,11 +8958,9 @@ public java.lang.String getDispatcher() {
        */
       public Builder setDispatcher(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000010;
+        if (value == null) { throw new NullPointerException(); }
         dispatcher_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -9122,8 +8969,8 @@ public Builder setDispatcher(
        * @return This builder for chaining.
        */
       public Builder clearDispatcher() {
-        bitField0_ = (bitField0_ & ~0x00000010);
         dispatcher_ = getDefaultInstance().getDispatcher();
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
       }
@@ -9134,11 +8981,9 @@ public Builder clearDispatcher() {
        */
       public Builder setDispatcherBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000010;
+        if (value == null) { throw new NullPointerException(); }
         dispatcher_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -9153,6 +8998,7 @@ public Builder setDispatcherBytes(
        * optional int32 scopeSerializerId = 6;
        * @return Whether the scopeSerializerId field is set.
        */
+      @java.lang.Override
       public boolean hasScopeSerializerId() {
         return ((bitField0_ & 0x00000020) != 0);
       }
@@ -9165,6 +9011,7 @@ public boolean hasScopeSerializerId() {
        * optional int32 scopeSerializerId = 6;
        * @return The scopeSerializerId.
        */
+      @java.lang.Override
       public int getScopeSerializerId() {
         return scopeSerializerId_;
       }
@@ -9179,8 +9026,9 @@ public int getScopeSerializerId() {
        * @return This builder for chaining.
        */
       public Builder setScopeSerializerId(int value) {
-        bitField0_ |= 0x00000020;
+
         scopeSerializerId_ = value;
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -9250,11 +9098,9 @@ public java.lang.String getScopeManifest() {
        */
       public Builder setScopeManifest(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000040;
+        if (value == null) { throw new NullPointerException(); }
         scopeManifest_ = value;
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -9263,8 +9109,8 @@ public Builder setScopeManifest(
        * @return This builder for chaining.
        */
       public Builder clearScopeManifest() {
-        bitField0_ = (bitField0_ & ~0x00000040);
         scopeManifest_ = getDefaultInstance().getScopeManifest();
+        bitField0_ = (bitField0_ & ~0x00000040);
         onChanged();
         return this;
       }
@@ -9275,11 +9121,9 @@ public Builder clearScopeManifest() {
        */
       public Builder setScopeManifestBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000040;
+        if (value == null) { throw new NullPointerException(); }
         scopeManifest_ = value;
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -9289,6 +9133,7 @@ public Builder setScopeManifestBytes(
        * optional int32 configSerializerId = 8;
        * @return Whether the configSerializerId field is set.
        */
+      @java.lang.Override
       public boolean hasConfigSerializerId() {
         return ((bitField0_ & 0x00000080) != 0);
       }
@@ -9296,6 +9141,7 @@ public boolean hasConfigSerializerId() {
        * optional int32 configSerializerId = 8;
        * @return The configSerializerId.
        */
+      @java.lang.Override
       public int getConfigSerializerId() {
         return configSerializerId_;
       }
@@ -9305,8 +9151,9 @@ public int getConfigSerializerId() {
        * @return This builder for chaining.
        */
       public Builder setConfigSerializerId(int value) {
-        bitField0_ |= 0x00000080;
+
         configSerializerId_ = value;
+        bitField0_ |= 0x00000080;
         onChanged();
         return this;
       }
@@ -9371,11 +9218,9 @@ public java.lang.String getConfigManifest() {
        */
       public Builder setConfigManifest(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000100;
+        if (value == null) { throw new NullPointerException(); }
         configManifest_ = value;
+        bitField0_ |= 0x00000100;
         onChanged();
         return this;
       }
@@ -9384,8 +9229,8 @@ public Builder setConfigManifest(
        * @return This builder for chaining.
        */
       public Builder clearConfigManifest() {
-        bitField0_ = (bitField0_ & ~0x00000100);
         configManifest_ = getDefaultInstance().getConfigManifest();
+        bitField0_ = (bitField0_ & ~0x00000100);
         onChanged();
         return this;
       }
@@ -9396,11 +9241,9 @@ public Builder clearConfigManifest() {
        */
       public Builder setConfigManifestBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000100;
+        if (value == null) { throw new NullPointerException(); }
         configManifest_ = value;
+        bitField0_ |= 0x00000100;
         onChanged();
         return this;
       }
@@ -9410,6 +9253,7 @@ public Builder setConfigManifestBytes(
        * optional int32 routerConfigSerializerId = 10;
        * @return Whether the routerConfigSerializerId field is set.
        */
+      @java.lang.Override
       public boolean hasRouterConfigSerializerId() {
         return ((bitField0_ & 0x00000200) != 0);
       }
@@ -9417,6 +9261,7 @@ public boolean hasRouterConfigSerializerId() {
        * optional int32 routerConfigSerializerId = 10;
        * @return The routerConfigSerializerId.
        */
+      @java.lang.Override
       public int getRouterConfigSerializerId() {
         return routerConfigSerializerId_;
       }
@@ -9426,8 +9271,9 @@ public int getRouterConfigSerializerId() {
        * @return This builder for chaining.
        */
       public Builder setRouterConfigSerializerId(int value) {
-        bitField0_ |= 0x00000200;
+
         routerConfigSerializerId_ = value;
+        bitField0_ |= 0x00000200;
         onChanged();
         return this;
       }
@@ -9492,11 +9338,9 @@ public java.lang.String getRouterConfigManifest() {
        */
       public Builder setRouterConfigManifest(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000400;
+        if (value == null) { throw new NullPointerException(); }
         routerConfigManifest_ = value;
+        bitField0_ |= 0x00000400;
         onChanged();
         return this;
       }
@@ -9505,8 +9349,8 @@ public Builder setRouterConfigManifest(
        * @return This builder for chaining.
        */
       public Builder clearRouterConfigManifest() {
-        bitField0_ = (bitField0_ & ~0x00000400);
         routerConfigManifest_ = getDefaultInstance().getRouterConfigManifest();
+        bitField0_ = (bitField0_ & ~0x00000400);
         onChanged();
         return this;
       }
@@ -9517,21 +9361,20 @@ public Builder clearRouterConfigManifest() {
        */
       public Builder setRouterConfigManifestBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000400;
+        if (value == null) { throw new NullPointerException(); }
         routerConfigManifest_ = value;
+        bitField0_ |= 0x00000400;
         onChanged();
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList tags_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      private org.apache.pekko.protobufv3.internal.LazyStringArrayList tags_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureTagsIsMutable() {
-        if (!((bitField0_ & 0x00000800) != 0)) {
+        if (!tags_.isModifiable()) {
           tags_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(tags_);
-          bitField0_ |= 0x00000800;
-         }
+        }
+        bitField0_ |= 0x00000800;
       }
       /**
        * repeated string tags = 12;
@@ -9539,7 +9382,8 @@ private void ensureTagsIsMutable() {
        */
       public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getTagsList() {
-        return tags_.getUnmodifiableView();
+        tags_.makeImmutable();
+        return tags_;
       }
       /**
        * repeated string tags = 12;
@@ -9573,11 +9417,10 @@ public java.lang.String getTags(int index) {
        */
       public Builder setTags(
           int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureTagsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureTagsIsMutable();
         tags_.set(index, value);
+        bitField0_ |= 0x00000800;
         onChanged();
         return this;
       }
@@ -9588,11 +9431,10 @@ public Builder setTags(
        */
       public Builder addTags(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureTagsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureTagsIsMutable();
         tags_.add(value);
+        bitField0_ |= 0x00000800;
         onChanged();
         return this;
       }
@@ -9606,6 +9448,7 @@ public Builder addAllTags(
         ensureTagsIsMutable();
         org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, tags_);
+        bitField0_ |= 0x00000800;
         onChanged();
         return this;
       }
@@ -9614,8 +9457,9 @@ public Builder addAllTags(
        * @return This builder for chaining.
        */
       public Builder clearTags() {
-        tags_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000800);
+        tags_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000800);;
         onChanged();
         return this;
       }
@@ -9626,11 +9470,10 @@ public Builder clearTags() {
        */
       public Builder addTagsBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureTagsIsMutable();
+        if (value == null) { throw new NullPointerException(); }
+        ensureTagsIsMutable();
         tags_.add(value);
+        bitField0_ |= 0x00000800;
         onChanged();
         return this;
       }
@@ -9667,7 +9510,18 @@ public DeployData parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new DeployData(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -9726,7 +9580,7 @@ public interface PekkoProtocolMessageOrBuilder extends
    *
    * Protobuf type {@code PekkoProtocolMessage}
    */
-  public  static final class PekkoProtocolMessage extends
+  public static final class PekkoProtocolMessage extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:PekkoProtocolMessage)
       PekkoProtocolMessageOrBuilder {
@@ -9746,67 +9600,6 @@ protected java.lang.Object newInstance(
       return new PekkoProtocolMessage();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private PekkoProtocolMessage(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              bitField0_ |= 0x00000001;
-              payload_ = input.readBytes();
-              break;
-            }
-            case 18: {
-              org.apache.pekko.remote.WireFormats.PekkoControlMessage.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = instruction_.toBuilder();
-              }
-              instruction_ = input.readMessage(org.apache.pekko.remote.WireFormats.PekkoControlMessage.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(instruction_);
-                instruction_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.WireFormats.internal_static_PekkoProtocolMessage_descriptor;
@@ -9822,11 +9615,12 @@ private PekkoProtocolMessage(
 
     private int bitField0_;
     public static final int PAYLOAD_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.ByteString payload_;
+    private org.apache.pekko.protobufv3.internal.ByteString payload_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * optional bytes payload = 1;
      * @return Whether the payload field is set.
      */
+    @java.lang.Override
     public boolean hasPayload() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -9834,6 +9628,7 @@ public boolean hasPayload() {
      * optional bytes payload = 1;
      * @return The payload.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getPayload() {
       return payload_;
     }
@@ -9844,6 +9639,7 @@ public org.apache.pekko.protobufv3.internal.ByteString getPayload() {
      * optional .PekkoControlMessage instruction = 2;
      * @return Whether the instruction field is set.
      */
+    @java.lang.Override
     public boolean hasInstruction() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -9851,12 +9647,14 @@ public boolean hasInstruction() {
      * optional .PekkoControlMessage instruction = 2;
      * @return The instruction.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.PekkoControlMessage getInstruction() {
       return instruction_ == null ? org.apache.pekko.remote.WireFormats.PekkoControlMessage.getDefaultInstance() : instruction_;
     }
     /**
      * optional .PekkoControlMessage instruction = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.PekkoControlMessageOrBuilder getInstructionOrBuilder() {
       return instruction_ == null ? org.apache.pekko.remote.WireFormats.PekkoControlMessage.getDefaultInstance() : instruction_;
     }
@@ -9887,7 +9685,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getInstruction());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -9904,7 +9702,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getInstruction());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -9929,7 +9727,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getInstruction()
             .equals(other.getInstruction())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -9948,7 +9746,7 @@ public int hashCode() {
         hash = (37 * hash) + INSTRUCTION_FIELD_NUMBER;
         hash = (53 * hash) + getInstruction().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -9997,11 +9795,13 @@ public static org.apache.pekko.remote.WireFormats.PekkoProtocolMessage parseFrom
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.WireFormats.PekkoProtocolMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.WireFormats.PekkoProtocolMessage parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -10088,14 +9888,13 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         payload_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (instructionBuilder_ == null) {
-          instruction_ = null;
-        } else {
-          instructionBuilder_.clear();
+        instruction_ = null;
+        if (instructionBuilder_ != null) {
+          instructionBuilder_.dispose();
+          instructionBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -10122,23 +9921,25 @@ public org.apache.pekko.remote.WireFormats.PekkoProtocolMessage build() {
       @java.lang.Override
       public org.apache.pekko.remote.WireFormats.PekkoProtocolMessage buildPartial() {
         org.apache.pekko.remote.WireFormats.PekkoProtocolMessage result = new org.apache.pekko.remote.WireFormats.PekkoProtocolMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.WireFormats.PekkoProtocolMessage result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.payload_ = payload_;
           to_bitField0_ |= 0x00000001;
         }
-        result.payload_ = payload_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (instructionBuilder_ == null) {
-            result.instruction_ = instruction_;
-          } else {
-            result.instruction_ = instructionBuilder_.build();
-          }
+          result.instruction_ = instructionBuilder_ == null
+              ? instruction_
+              : instructionBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -10191,7 +9992,7 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.PekkoProtocolMessag
         if (other.hasInstruction()) {
           mergeInstruction(other.getInstruction());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -10211,17 +10012,42 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.WireFormats.PekkoProtocolMessage parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                payload_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getInstructionFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.WireFormats.PekkoProtocolMessage) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -10231,6 +10057,7 @@ public Builder mergeFrom(
        * optional bytes payload = 1;
        * @return Whether the payload field is set.
        */
+      @java.lang.Override
       public boolean hasPayload() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -10238,6 +10065,7 @@ public boolean hasPayload() {
        * optional bytes payload = 1;
        * @return The payload.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getPayload() {
         return payload_;
       }
@@ -10247,11 +10075,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getPayload() {
        * @return This builder for chaining.
        */
       public Builder setPayload(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         payload_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -10296,11 +10122,11 @@ public Builder setInstruction(org.apache.pekko.remote.WireFormats.PekkoControlMe
             throw new NullPointerException();
           }
           instruction_ = value;
-          onChanged();
         } else {
           instructionBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -10310,11 +10136,11 @@ public Builder setInstruction(
           org.apache.pekko.remote.WireFormats.PekkoControlMessage.Builder builderForValue) {
         if (instructionBuilder_ == null) {
           instruction_ = builderForValue.build();
-          onChanged();
         } else {
           instructionBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -10323,31 +10149,32 @@ public Builder setInstruction(
       public Builder mergeInstruction(org.apache.pekko.remote.WireFormats.PekkoControlMessage value) {
         if (instructionBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              instruction_ != null &&
-              instruction_ != org.apache.pekko.remote.WireFormats.PekkoControlMessage.getDefaultInstance()) {
-            instruction_ =
-              org.apache.pekko.remote.WireFormats.PekkoControlMessage.newBuilder(instruction_).mergeFrom(value).buildPartial();
+            instruction_ != null &&
+            instruction_ != org.apache.pekko.remote.WireFormats.PekkoControlMessage.getDefaultInstance()) {
+            getInstructionBuilder().mergeFrom(value);
           } else {
             instruction_ = value;
           }
-          onChanged();
         } else {
           instructionBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (instruction_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .PekkoControlMessage instruction = 2;
        */
       public Builder clearInstruction() {
-        if (instructionBuilder_ == null) {
-          instruction_ = null;
-          onChanged();
-        } else {
-          instructionBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        instruction_ = null;
+        if (instructionBuilder_ != null) {
+          instructionBuilder_.dispose();
+          instructionBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -10418,7 +10245,18 @@ public PekkoProtocolMessage parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new PekkoProtocolMessage(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -10476,7 +10314,7 @@ public interface PekkoControlMessageOrBuilder extends
    *
    * Protobuf type {@code PekkoControlMessage}
    */
-  public  static final class PekkoControlMessage extends
+  public static final class PekkoControlMessage extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:PekkoControlMessage)
       PekkoControlMessageOrBuilder {
@@ -10496,74 +10334,6 @@ protected java.lang.Object newInstance(
       return new PekkoControlMessage();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private PekkoControlMessage(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              int rawValue = input.readEnum();
-                @SuppressWarnings("deprecation")
-              org.apache.pekko.remote.WireFormats.CommandType value = org.apache.pekko.remote.WireFormats.CommandType.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(1, rawValue);
-              } else {
-                bitField0_ |= 0x00000001;
-                commandType_ = rawValue;
-              }
-              break;
-            }
-            case 18: {
-              org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = handshakeInfo_.toBuilder();
-              }
-              handshakeInfo_ = input.readMessage(org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(handshakeInfo_);
-                handshakeInfo_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.WireFormats.internal_static_PekkoControlMessage_descriptor;
@@ -10579,21 +10349,20 @@ private PekkoControlMessage(
 
     private int bitField0_;
     public static final int COMMANDTYPE_FIELD_NUMBER = 1;
-    private int commandType_;
+    private int commandType_ = 1;
     /**
      * required .CommandType commandType = 1;
      * @return Whether the commandType field is set.
      */
-    public boolean hasCommandType() {
+    @java.lang.Override public boolean hasCommandType() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      * required .CommandType commandType = 1;
      * @return The commandType.
      */
-    public org.apache.pekko.remote.WireFormats.CommandType getCommandType() {
-      @SuppressWarnings("deprecation")
-      org.apache.pekko.remote.WireFormats.CommandType result = org.apache.pekko.remote.WireFormats.CommandType.valueOf(commandType_);
+    @java.lang.Override public org.apache.pekko.remote.WireFormats.CommandType getCommandType() {
+      org.apache.pekko.remote.WireFormats.CommandType result = org.apache.pekko.remote.WireFormats.CommandType.forNumber(commandType_);
       return result == null ? org.apache.pekko.remote.WireFormats.CommandType.ASSOCIATE : result;
     }
 
@@ -10603,6 +10372,7 @@ public org.apache.pekko.remote.WireFormats.CommandType getCommandType() {
      * optional .PekkoHandshakeInfo handshakeInfo = 2;
      * @return Whether the handshakeInfo field is set.
      */
+    @java.lang.Override
     public boolean hasHandshakeInfo() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -10610,12 +10380,14 @@ public boolean hasHandshakeInfo() {
      * optional .PekkoHandshakeInfo handshakeInfo = 2;
      * @return The handshakeInfo.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo getHandshakeInfo() {
       return handshakeInfo_ == null ? org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo.getDefaultInstance() : handshakeInfo_;
     }
     /**
      * optional .PekkoHandshakeInfo handshakeInfo = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.PekkoHandshakeInfoOrBuilder getHandshakeInfoOrBuilder() {
       return handshakeInfo_ == null ? org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo.getDefaultInstance() : handshakeInfo_;
     }
@@ -10650,7 +10422,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getHandshakeInfo());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -10667,7 +10439,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getHandshakeInfo());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -10691,7 +10463,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getHandshakeInfo()
             .equals(other.getHandshakeInfo())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -10710,7 +10482,7 @@ public int hashCode() {
         hash = (37 * hash) + HANDSHAKEINFO_FIELD_NUMBER;
         hash = (53 * hash) + getHandshakeInfo().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -10759,11 +10531,13 @@ public static org.apache.pekko.remote.WireFormats.PekkoControlMessage parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.WireFormats.PekkoControlMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.WireFormats.PekkoControlMessage parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -10849,14 +10623,13 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         commandType_ = 1;
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (handshakeInfoBuilder_ == null) {
-          handshakeInfo_ = null;
-        } else {
-          handshakeInfoBuilder_.clear();
+        handshakeInfo_ = null;
+        if (handshakeInfoBuilder_ != null) {
+          handshakeInfoBuilder_.dispose();
+          handshakeInfoBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -10883,23 +10656,25 @@ public org.apache.pekko.remote.WireFormats.PekkoControlMessage build() {
       @java.lang.Override
       public org.apache.pekko.remote.WireFormats.PekkoControlMessage buildPartial() {
         org.apache.pekko.remote.WireFormats.PekkoControlMessage result = new org.apache.pekko.remote.WireFormats.PekkoControlMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.WireFormats.PekkoControlMessage result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.commandType_ = commandType_;
           to_bitField0_ |= 0x00000001;
         }
-        result.commandType_ = commandType_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (handshakeInfoBuilder_ == null) {
-            result.handshakeInfo_ = handshakeInfo_;
-          } else {
-            result.handshakeInfo_ = handshakeInfoBuilder_.build();
-          }
+          result.handshakeInfo_ = handshakeInfoBuilder_ == null
+              ? handshakeInfo_
+              : handshakeInfoBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -10952,7 +10727,7 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.PekkoControlMessage
         if (other.hasHandshakeInfo()) {
           mergeHandshakeInfo(other.getHandshakeInfo());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -10975,17 +10750,49 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.WireFormats.PekkoControlMessage parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                int tmpRaw = input.readEnum();
+                org.apache.pekko.remote.WireFormats.CommandType tmpValue =
+                    org.apache.pekko.remote.WireFormats.CommandType.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(1, tmpRaw);
+                } else {
+                  commandType_ = tmpRaw;
+                  bitField0_ |= 0x00000001;
+                }
+                break;
+              } // case 8
+              case 18: {
+                input.readMessage(
+                    getHandshakeInfoFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.WireFormats.PekkoControlMessage) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -10995,16 +10802,16 @@ public Builder mergeFrom(
        * required .CommandType commandType = 1;
        * @return Whether the commandType field is set.
        */
-      public boolean hasCommandType() {
+      @java.lang.Override public boolean hasCommandType() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        * required .CommandType commandType = 1;
        * @return The commandType.
        */
+      @java.lang.Override
       public org.apache.pekko.remote.WireFormats.CommandType getCommandType() {
-        @SuppressWarnings("deprecation")
-        org.apache.pekko.remote.WireFormats.CommandType result = org.apache.pekko.remote.WireFormats.CommandType.valueOf(commandType_);
+        org.apache.pekko.remote.WireFormats.CommandType result = org.apache.pekko.remote.WireFormats.CommandType.forNumber(commandType_);
         return result == null ? org.apache.pekko.remote.WireFormats.CommandType.ASSOCIATE : result;
       }
       /**
@@ -11062,11 +10869,11 @@ public Builder setHandshakeInfo(org.apache.pekko.remote.WireFormats.PekkoHandsha
             throw new NullPointerException();
           }
           handshakeInfo_ = value;
-          onChanged();
         } else {
           handshakeInfoBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -11076,11 +10883,11 @@ public Builder setHandshakeInfo(
           org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo.Builder builderForValue) {
         if (handshakeInfoBuilder_ == null) {
           handshakeInfo_ = builderForValue.build();
-          onChanged();
         } else {
           handshakeInfoBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -11089,31 +10896,32 @@ public Builder setHandshakeInfo(
       public Builder mergeHandshakeInfo(org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo value) {
         if (handshakeInfoBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              handshakeInfo_ != null &&
-              handshakeInfo_ != org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo.getDefaultInstance()) {
-            handshakeInfo_ =
-              org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo.newBuilder(handshakeInfo_).mergeFrom(value).buildPartial();
+            handshakeInfo_ != null &&
+            handshakeInfo_ != org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo.getDefaultInstance()) {
+            getHandshakeInfoBuilder().mergeFrom(value);
           } else {
             handshakeInfo_ = value;
           }
-          onChanged();
         } else {
           handshakeInfoBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (handshakeInfo_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .PekkoHandshakeInfo handshakeInfo = 2;
        */
       public Builder clearHandshakeInfo() {
-        if (handshakeInfoBuilder_ == null) {
-          handshakeInfo_ = null;
-          onChanged();
-        } else {
-          handshakeInfoBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        handshakeInfo_ = null;
+        if (handshakeInfoBuilder_ != null) {
+          handshakeInfoBuilder_.dispose();
+          handshakeInfoBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -11184,7 +10992,18 @@ public PekkoControlMessage parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new PekkoControlMessage(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -11254,7 +11073,7 @@ public interface PekkoHandshakeInfoOrBuilder extends
   /**
    * Protobuf type {@code PekkoHandshakeInfo}
    */
-  public  static final class PekkoHandshakeInfo extends
+  public static final class PekkoHandshakeInfo extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:PekkoHandshakeInfo)
       PekkoHandshakeInfoOrBuilder {
@@ -11274,73 +11093,6 @@ protected java.lang.Object newInstance(
       return new PekkoHandshakeInfo();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private PekkoHandshakeInfo(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.WireFormats.AddressData.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = origin_.toBuilder();
-              }
-              origin_ = input.readMessage(org.apache.pekko.remote.WireFormats.AddressData.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(origin_);
-                origin_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 17: {
-              bitField0_ |= 0x00000002;
-              uid_ = input.readFixed64();
-              break;
-            }
-            case 26: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000004;
-              cookie_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.WireFormats.internal_static_PekkoHandshakeInfo_descriptor;
@@ -11361,6 +11113,7 @@ private PekkoHandshakeInfo(
      * required .AddressData origin = 1;
      * @return Whether the origin field is set.
      */
+    @java.lang.Override
     public boolean hasOrigin() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -11368,22 +11121,25 @@ public boolean hasOrigin() {
      * required .AddressData origin = 1;
      * @return The origin.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.AddressData getOrigin() {
       return origin_ == null ? org.apache.pekko.remote.WireFormats.AddressData.getDefaultInstance() : origin_;
     }
     /**
      * required .AddressData origin = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.AddressDataOrBuilder getOriginOrBuilder() {
       return origin_ == null ? org.apache.pekko.remote.WireFormats.AddressData.getDefaultInstance() : origin_;
     }
 
     public static final int UID_FIELD_NUMBER = 2;
-    private long uid_;
+    private long uid_ = 0L;
     /**
      * required fixed64 uid = 2;
      * @return Whether the uid field is set.
      */
+    @java.lang.Override
     public boolean hasUid() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -11391,16 +11147,19 @@ public boolean hasUid() {
      * required fixed64 uid = 2;
      * @return The uid.
      */
+    @java.lang.Override
     public long getUid() {
       return uid_;
     }
 
     public static final int COOKIE_FIELD_NUMBER = 3;
-    private volatile java.lang.Object cookie_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object cookie_ = "";
     /**
      * optional string cookie = 3;
      * @return Whether the cookie field is set.
      */
+    @java.lang.Override
     public boolean hasCookie() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -11408,6 +11167,7 @@ public boolean hasCookie() {
      * optional string cookie = 3;
      * @return The cookie.
      */
+    @java.lang.Override
     public java.lang.String getCookie() {
       java.lang.Object ref = cookie_;
       if (ref instanceof java.lang.String) {
@@ -11426,6 +11186,7 @@ public java.lang.String getCookie() {
      * optional string cookie = 3;
      * @return The bytes for cookie.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getCookieBytes() {
       java.lang.Object ref = cookie_;
@@ -11475,7 +11236,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, cookie_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -11495,7 +11256,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000004) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(3, cookie_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -11525,7 +11286,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getCookie()
             .equals(other.getCookie())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -11549,7 +11310,7 @@ public int hashCode() {
         hash = (37 * hash) + COOKIE_FIELD_NUMBER;
         hash = (53 * hash) + getCookie().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -11598,11 +11359,13 @@ public static org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -11683,16 +11446,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (originBuilder_ == null) {
-          origin_ = null;
-        } else {
-          originBuilder_.clear();
+        bitField0_ = 0;
+        origin_ = null;
+        if (originBuilder_ != null) {
+          originBuilder_.dispose();
+          originBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         uid_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
         cookie_ = "";
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -11719,14 +11480,18 @@ public org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo build() {
       @java.lang.Override
       public org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo buildPartial() {
         org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo result = new org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (originBuilder_ == null) {
-            result.origin_ = origin_;
-          } else {
-            result.origin_ = originBuilder_.build();
-          }
+          result.origin_ = originBuilder_ == null
+              ? origin_
+              : originBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
@@ -11734,12 +11499,10 @@ public org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo buildPartial() {
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.cookie_ = cookie_;
           to_bitField0_ |= 0x00000004;
         }
-        result.cookie_ = cookie_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -11793,11 +11556,11 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo
           setUid(other.getUid());
         }
         if (other.hasCookie()) {
-          bitField0_ |= 0x00000004;
           cookie_ = other.cookie_;
+          bitField0_ |= 0x00000004;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -11821,17 +11584,47 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getOriginFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 17: {
+                uid_ = input.readFixed64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 17
+              case 26: {
+                cookie_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.WireFormats.PekkoHandshakeInfo) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -11866,11 +11659,11 @@ public Builder setOrigin(org.apache.pekko.remote.WireFormats.AddressData value)
             throw new NullPointerException();
           }
           origin_ = value;
-          onChanged();
         } else {
           originBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -11880,11 +11673,11 @@ public Builder setOrigin(
           org.apache.pekko.remote.WireFormats.AddressData.Builder builderForValue) {
         if (originBuilder_ == null) {
           origin_ = builderForValue.build();
-          onChanged();
         } else {
           originBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -11893,31 +11686,32 @@ public Builder setOrigin(
       public Builder mergeOrigin(org.apache.pekko.remote.WireFormats.AddressData value) {
         if (originBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              origin_ != null &&
-              origin_ != org.apache.pekko.remote.WireFormats.AddressData.getDefaultInstance()) {
-            origin_ =
-              org.apache.pekko.remote.WireFormats.AddressData.newBuilder(origin_).mergeFrom(value).buildPartial();
+            origin_ != null &&
+            origin_ != org.apache.pekko.remote.WireFormats.AddressData.getDefaultInstance()) {
+            getOriginBuilder().mergeFrom(value);
           } else {
             origin_ = value;
           }
-          onChanged();
         } else {
           originBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (origin_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .AddressData origin = 1;
        */
       public Builder clearOrigin() {
-        if (originBuilder_ == null) {
-          origin_ = null;
-          onChanged();
-        } else {
-          originBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        origin_ = null;
+        if (originBuilder_ != null) {
+          originBuilder_.dispose();
+          originBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -11961,6 +11755,7 @@ public org.apache.pekko.remote.WireFormats.AddressDataOrBuilder getOriginOrBuild
        * required fixed64 uid = 2;
        * @return Whether the uid field is set.
        */
+      @java.lang.Override
       public boolean hasUid() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -11968,6 +11763,7 @@ public boolean hasUid() {
        * required fixed64 uid = 2;
        * @return The uid.
        */
+      @java.lang.Override
       public long getUid() {
         return uid_;
       }
@@ -11977,8 +11773,9 @@ public long getUid() {
        * @return This builder for chaining.
        */
       public Builder setUid(long value) {
-        bitField0_ |= 0x00000002;
+
         uid_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -12043,11 +11840,9 @@ public java.lang.String getCookie() {
        */
       public Builder setCookie(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         cookie_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -12056,8 +11851,8 @@ public Builder setCookie(
        * @return This builder for chaining.
        */
       public Builder clearCookie() {
-        bitField0_ = (bitField0_ & ~0x00000004);
         cookie_ = getDefaultInstance().getCookie();
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -12068,11 +11863,9 @@ public Builder clearCookie() {
        */
       public Builder setCookieBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         cookie_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -12109,7 +11902,18 @@ public PekkoHandshakeInfo parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new PekkoHandshakeInfo(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -12158,7 +11962,7 @@ public interface FiniteDurationOrBuilder extends
   /**
    * Protobuf type {@code FiniteDuration}
    */
-  public  static final class FiniteDuration extends
+  public static final class FiniteDuration extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:FiniteDuration)
       FiniteDurationOrBuilder {
@@ -12178,66 +11982,6 @@ protected java.lang.Object newInstance(
       return new FiniteDuration();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private FiniteDuration(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              value_ = input.readInt64();
-              break;
-            }
-            case 16: {
-              int rawValue = input.readEnum();
-                @SuppressWarnings("deprecation")
-              org.apache.pekko.remote.WireFormats.TimeUnit value = org.apache.pekko.remote.WireFormats.TimeUnit.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(2, rawValue);
-              } else {
-                bitField0_ |= 0x00000002;
-                unit_ = rawValue;
-              }
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.WireFormats.internal_static_FiniteDuration_descriptor;
@@ -12253,11 +11997,12 @@ private FiniteDuration(
 
     private int bitField0_;
     public static final int VALUE_FIELD_NUMBER = 1;
-    private long value_;
+    private long value_ = 0L;
     /**
      * required int64 value = 1;
      * @return Whether the value field is set.
      */
+    @java.lang.Override
     public boolean hasValue() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -12265,26 +12010,26 @@ public boolean hasValue() {
      * required int64 value = 1;
      * @return The value.
      */
+    @java.lang.Override
     public long getValue() {
       return value_;
     }
 
     public static final int UNIT_FIELD_NUMBER = 2;
-    private int unit_;
+    private int unit_ = 1;
     /**
      * required .TimeUnit unit = 2;
      * @return Whether the unit field is set.
      */
-    public boolean hasUnit() {
+    @java.lang.Override public boolean hasUnit() {
       return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      * required .TimeUnit unit = 2;
      * @return The unit.
      */
-    public org.apache.pekko.remote.WireFormats.TimeUnit getUnit() {
-      @SuppressWarnings("deprecation")
-      org.apache.pekko.remote.WireFormats.TimeUnit result = org.apache.pekko.remote.WireFormats.TimeUnit.valueOf(unit_);
+    @java.lang.Override public org.apache.pekko.remote.WireFormats.TimeUnit getUnit() {
+      org.apache.pekko.remote.WireFormats.TimeUnit result = org.apache.pekko.remote.WireFormats.TimeUnit.forNumber(unit_);
       return result == null ? org.apache.pekko.remote.WireFormats.TimeUnit.NANOSECONDS : result;
     }
 
@@ -12316,7 +12061,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeEnum(2, unit_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -12333,7 +12078,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeEnumSize(2, unit_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -12357,7 +12102,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasUnit()) {
         if (unit_ != other.unit_) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -12377,7 +12122,7 @@ public int hashCode() {
         hash = (37 * hash) + UNIT_FIELD_NUMBER;
         hash = (53 * hash) + unit_;
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -12426,11 +12171,13 @@ public static org.apache.pekko.remote.WireFormats.FiniteDuration parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.WireFormats.FiniteDuration parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.WireFormats.FiniteDuration parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -12494,26 +12241,20 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.WireFormats.FiniteDuration.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         value_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         unit_ = 1;
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -12540,6 +12281,12 @@ public org.apache.pekko.remote.WireFormats.FiniteDuration build() {
       @java.lang.Override
       public org.apache.pekko.remote.WireFormats.FiniteDuration buildPartial() {
         org.apache.pekko.remote.WireFormats.FiniteDuration result = new org.apache.pekko.remote.WireFormats.FiniteDuration(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.WireFormats.FiniteDuration result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -12547,12 +12294,10 @@ public org.apache.pekko.remote.WireFormats.FiniteDuration buildPartial() {
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.unit_ = unit_;
           to_bitField0_ |= 0x00000002;
         }
-        result.unit_ = unit_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -12605,7 +12350,7 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.FiniteDuration othe
         if (other.hasUnit()) {
           setUnit(other.getUnit());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -12626,17 +12371,47 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.WireFormats.FiniteDuration parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                value_ = input.readInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 16: {
+                int tmpRaw = input.readEnum();
+                org.apache.pekko.remote.WireFormats.TimeUnit tmpValue =
+                    org.apache.pekko.remote.WireFormats.TimeUnit.forNumber(tmpRaw);
+                if (tmpValue == null) {
+                  mergeUnknownVarintField(2, tmpRaw);
+                } else {
+                  unit_ = tmpRaw;
+                  bitField0_ |= 0x00000002;
+                }
+                break;
+              } // case 16
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.WireFormats.FiniteDuration) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -12646,6 +12421,7 @@ public Builder mergeFrom(
        * required int64 value = 1;
        * @return Whether the value field is set.
        */
+      @java.lang.Override
       public boolean hasValue() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -12653,6 +12429,7 @@ public boolean hasValue() {
        * required int64 value = 1;
        * @return The value.
        */
+      @java.lang.Override
       public long getValue() {
         return value_;
       }
@@ -12662,8 +12439,9 @@ public long getValue() {
        * @return This builder for chaining.
        */
       public Builder setValue(long value) {
-        bitField0_ |= 0x00000001;
+
         value_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -12683,16 +12461,16 @@ public Builder clearValue() {
        * required .TimeUnit unit = 2;
        * @return Whether the unit field is set.
        */
-      public boolean hasUnit() {
+      @java.lang.Override public boolean hasUnit() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
        * required .TimeUnit unit = 2;
        * @return The unit.
        */
+      @java.lang.Override
       public org.apache.pekko.remote.WireFormats.TimeUnit getUnit() {
-        @SuppressWarnings("deprecation")
-        org.apache.pekko.remote.WireFormats.TimeUnit result = org.apache.pekko.remote.WireFormats.TimeUnit.valueOf(unit_);
+        org.apache.pekko.remote.WireFormats.TimeUnit result = org.apache.pekko.remote.WireFormats.TimeUnit.forNumber(unit_);
         return result == null ? org.apache.pekko.remote.WireFormats.TimeUnit.NANOSECONDS : result;
       }
       /**
@@ -12752,7 +12530,18 @@ public FiniteDuration parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new FiniteDuration(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -12794,7 +12583,7 @@ public interface RemoteScopeOrBuilder extends
   /**
    * Protobuf type {@code RemoteScope}
    */
-  public  static final class RemoteScope extends
+  public static final class RemoteScope extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:RemoteScope)
       RemoteScopeOrBuilder {
@@ -12813,62 +12602,6 @@ protected java.lang.Object newInstance(
       return new RemoteScope();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private RemoteScope(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.WireFormats.AddressData.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = node_.toBuilder();
-              }
-              node_ = input.readMessage(org.apache.pekko.remote.WireFormats.AddressData.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(node_);
-                node_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.WireFormats.internal_static_RemoteScope_descriptor;
@@ -12889,6 +12622,7 @@ private RemoteScope(
      * required .AddressData node = 1;
      * @return Whether the node field is set.
      */
+    @java.lang.Override
     public boolean hasNode() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -12896,12 +12630,14 @@ public boolean hasNode() {
      * required .AddressData node = 1;
      * @return The node.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.AddressData getNode() {
       return node_ == null ? org.apache.pekko.remote.WireFormats.AddressData.getDefaultInstance() : node_;
     }
     /**
      * required .AddressData node = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.AddressDataOrBuilder getNodeOrBuilder() {
       return node_ == null ? org.apache.pekko.remote.WireFormats.AddressData.getDefaultInstance() : node_;
     }
@@ -12931,7 +12667,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getNode());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -12944,7 +12680,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getNode());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -12964,7 +12700,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getNode()
             .equals(other.getNode())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -12979,7 +12715,7 @@ public int hashCode() {
         hash = (37 * hash) + NODE_FIELD_NUMBER;
         hash = (53 * hash) + getNode().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -13028,11 +12764,13 @@ public static org.apache.pekko.remote.WireFormats.RemoteScope parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.WireFormats.RemoteScope parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.WireFormats.RemoteScope parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -13113,12 +12851,12 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (nodeBuilder_ == null) {
-          node_ = null;
-        } else {
-          nodeBuilder_.clear();
+        bitField0_ = 0;
+        node_ = null;
+        if (nodeBuilder_ != null) {
+          nodeBuilder_.dispose();
+          nodeBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -13145,19 +12883,21 @@ public org.apache.pekko.remote.WireFormats.RemoteScope build() {
       @java.lang.Override
       public org.apache.pekko.remote.WireFormats.RemoteScope buildPartial() {
         org.apache.pekko.remote.WireFormats.RemoteScope result = new org.apache.pekko.remote.WireFormats.RemoteScope(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.WireFormats.RemoteScope result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (nodeBuilder_ == null) {
-            result.node_ = node_;
-          } else {
-            result.node_ = nodeBuilder_.build();
-          }
+          result.node_ = nodeBuilder_ == null
+              ? node_
+              : nodeBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -13207,7 +12947,7 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.RemoteScope other)
         if (other.hasNode()) {
           mergeNode(other.getNode());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -13228,17 +12968,37 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.WireFormats.RemoteScope parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getNodeFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.WireFormats.RemoteScope) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -13273,11 +13033,11 @@ public Builder setNode(org.apache.pekko.remote.WireFormats.AddressData value) {
             throw new NullPointerException();
           }
           node_ = value;
-          onChanged();
         } else {
           nodeBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -13287,11 +13047,11 @@ public Builder setNode(
           org.apache.pekko.remote.WireFormats.AddressData.Builder builderForValue) {
         if (nodeBuilder_ == null) {
           node_ = builderForValue.build();
-          onChanged();
         } else {
           nodeBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -13300,31 +13060,32 @@ public Builder setNode(
       public Builder mergeNode(org.apache.pekko.remote.WireFormats.AddressData value) {
         if (nodeBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              node_ != null &&
-              node_ != org.apache.pekko.remote.WireFormats.AddressData.getDefaultInstance()) {
-            node_ =
-              org.apache.pekko.remote.WireFormats.AddressData.newBuilder(node_).mergeFrom(value).buildPartial();
+            node_ != null &&
+            node_ != org.apache.pekko.remote.WireFormats.AddressData.getDefaultInstance()) {
+            getNodeBuilder().mergeFrom(value);
           } else {
             node_ = value;
           }
-          onChanged();
         } else {
           nodeBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (node_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .AddressData node = 1;
        */
       public Builder clearNode() {
-        if (nodeBuilder_ == null) {
-          node_ = null;
-          onChanged();
-        } else {
-          nodeBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        node_ = null;
+        if (nodeBuilder_ != null) {
+          nodeBuilder_.dispose();
+          nodeBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -13395,7 +13156,18 @@ public RemoteScope parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new RemoteScope(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -13499,7 +13271,7 @@ public interface DefaultResizerOrBuilder extends
   /**
    * Protobuf type {@code DefaultResizer}
    */
-  public  static final class DefaultResizer extends
+  public static final class DefaultResizer extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:DefaultResizer)
       DefaultResizerOrBuilder {
@@ -13518,84 +13290,6 @@ protected java.lang.Object newInstance(
       return new DefaultResizer();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private DefaultResizer(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              lowerBound_ = input.readUInt32();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              upperBound_ = input.readUInt32();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              pressureThreshold_ = input.readUInt32();
-              break;
-            }
-            case 33: {
-              bitField0_ |= 0x00000008;
-              rampupRate_ = input.readDouble();
-              break;
-            }
-            case 41: {
-              bitField0_ |= 0x00000010;
-              backoffThreshold_ = input.readDouble();
-              break;
-            }
-            case 49: {
-              bitField0_ |= 0x00000020;
-              backoffRate_ = input.readDouble();
-              break;
-            }
-            case 56: {
-              bitField0_ |= 0x00000040;
-              messagesPerResize_ = input.readUInt32();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.WireFormats.internal_static_DefaultResizer_descriptor;
@@ -13611,11 +13305,12 @@ private DefaultResizer(
 
     private int bitField0_;
     public static final int LOWERBOUND_FIELD_NUMBER = 1;
-    private int lowerBound_;
+    private int lowerBound_ = 0;
     /**
      * required uint32 lowerBound = 1;
      * @return Whether the lowerBound field is set.
      */
+    @java.lang.Override
     public boolean hasLowerBound() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -13623,16 +13318,18 @@ public boolean hasLowerBound() {
      * required uint32 lowerBound = 1;
      * @return The lowerBound.
      */
+    @java.lang.Override
     public int getLowerBound() {
       return lowerBound_;
     }
 
     public static final int UPPERBOUND_FIELD_NUMBER = 2;
-    private int upperBound_;
+    private int upperBound_ = 0;
     /**
      * required uint32 upperBound = 2;
      * @return Whether the upperBound field is set.
      */
+    @java.lang.Override
     public boolean hasUpperBound() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -13640,16 +13337,18 @@ public boolean hasUpperBound() {
      * required uint32 upperBound = 2;
      * @return The upperBound.
      */
+    @java.lang.Override
     public int getUpperBound() {
       return upperBound_;
     }
 
     public static final int PRESSURETHRESHOLD_FIELD_NUMBER = 3;
-    private int pressureThreshold_;
+    private int pressureThreshold_ = 0;
     /**
      * required uint32 pressureThreshold = 3;
      * @return Whether the pressureThreshold field is set.
      */
+    @java.lang.Override
     public boolean hasPressureThreshold() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -13657,16 +13356,18 @@ public boolean hasPressureThreshold() {
      * required uint32 pressureThreshold = 3;
      * @return The pressureThreshold.
      */
+    @java.lang.Override
     public int getPressureThreshold() {
       return pressureThreshold_;
     }
 
     public static final int RAMPUPRATE_FIELD_NUMBER = 4;
-    private double rampupRate_;
+    private double rampupRate_ = 0D;
     /**
      * required double rampupRate = 4;
      * @return Whether the rampupRate field is set.
      */
+    @java.lang.Override
     public boolean hasRampupRate() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -13674,16 +13375,18 @@ public boolean hasRampupRate() {
      * required double rampupRate = 4;
      * @return The rampupRate.
      */
+    @java.lang.Override
     public double getRampupRate() {
       return rampupRate_;
     }
 
     public static final int BACKOFFTHRESHOLD_FIELD_NUMBER = 5;
-    private double backoffThreshold_;
+    private double backoffThreshold_ = 0D;
     /**
      * required double backoffThreshold = 5;
      * @return Whether the backoffThreshold field is set.
      */
+    @java.lang.Override
     public boolean hasBackoffThreshold() {
       return ((bitField0_ & 0x00000010) != 0);
     }
@@ -13691,16 +13394,18 @@ public boolean hasBackoffThreshold() {
      * required double backoffThreshold = 5;
      * @return The backoffThreshold.
      */
+    @java.lang.Override
     public double getBackoffThreshold() {
       return backoffThreshold_;
     }
 
     public static final int BACKOFFRATE_FIELD_NUMBER = 6;
-    private double backoffRate_;
+    private double backoffRate_ = 0D;
     /**
      * required double backoffRate = 6;
      * @return Whether the backoffRate field is set.
      */
+    @java.lang.Override
     public boolean hasBackoffRate() {
       return ((bitField0_ & 0x00000020) != 0);
     }
@@ -13708,16 +13413,18 @@ public boolean hasBackoffRate() {
      * required double backoffRate = 6;
      * @return The backoffRate.
      */
+    @java.lang.Override
     public double getBackoffRate() {
       return backoffRate_;
     }
 
     public static final int MESSAGESPERRESIZE_FIELD_NUMBER = 7;
-    private int messagesPerResize_;
+    private int messagesPerResize_ = 0;
     /**
      * required uint32 messagesPerResize = 7;
      * @return Whether the messagesPerResize field is set.
      */
+    @java.lang.Override
     public boolean hasMessagesPerResize() {
       return ((bitField0_ & 0x00000040) != 0);
     }
@@ -13725,6 +13432,7 @@ public boolean hasMessagesPerResize() {
      * required uint32 messagesPerResize = 7;
      * @return The messagesPerResize.
      */
+    @java.lang.Override
     public int getMessagesPerResize() {
       return messagesPerResize_;
     }
@@ -13792,7 +13500,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000040) != 0)) {
         output.writeUInt32(7, messagesPerResize_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -13829,7 +13537,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(7, messagesPerResize_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -13882,7 +13590,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getMessagesPerResize()
             != other.getMessagesPerResize()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -13924,7 +13632,7 @@ public int hashCode() {
         hash = (37 * hash) + MESSAGESPERRESIZE_FIELD_NUMBER;
         hash = (53 * hash) + getMessagesPerResize();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -13973,11 +13681,13 @@ public static org.apache.pekko.remote.WireFormats.DefaultResizer parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.WireFormats.DefaultResizer parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.WireFormats.DefaultResizer parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -14041,36 +13751,25 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.WireFormats.DefaultResizer.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         lowerBound_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000001);
         upperBound_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         pressureThreshold_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000004);
         rampupRate_ = 0D;
-        bitField0_ = (bitField0_ & ~0x00000008);
         backoffThreshold_ = 0D;
-        bitField0_ = (bitField0_ & ~0x00000010);
         backoffRate_ = 0D;
-        bitField0_ = (bitField0_ & ~0x00000020);
         messagesPerResize_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000040);
         return this;
       }
 
@@ -14097,6 +13796,12 @@ public org.apache.pekko.remote.WireFormats.DefaultResizer build() {
       @java.lang.Override
       public org.apache.pekko.remote.WireFormats.DefaultResizer buildPartial() {
         org.apache.pekko.remote.WireFormats.DefaultResizer result = new org.apache.pekko.remote.WireFormats.DefaultResizer(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.WireFormats.DefaultResizer result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -14127,9 +13832,7 @@ public org.apache.pekko.remote.WireFormats.DefaultResizer buildPartial() {
           result.messagesPerResize_ = messagesPerResize_;
           to_bitField0_ |= 0x00000040;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -14197,7 +13900,7 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.DefaultResizer othe
         if (other.hasMessagesPerResize()) {
           setMessagesPerResize(other.getMessagesPerResize());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -14233,17 +13936,65 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.WireFormats.DefaultResizer parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                lowerBound_ = input.readUInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 16: {
+                upperBound_ = input.readUInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                pressureThreshold_ = input.readUInt32();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 33: {
+                rampupRate_ = input.readDouble();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 33
+              case 41: {
+                backoffThreshold_ = input.readDouble();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 41
+              case 49: {
+                backoffRate_ = input.readDouble();
+                bitField0_ |= 0x00000020;
+                break;
+              } // case 49
+              case 56: {
+                messagesPerResize_ = input.readUInt32();
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 56
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.WireFormats.DefaultResizer) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -14253,6 +14004,7 @@ public Builder mergeFrom(
        * required uint32 lowerBound = 1;
        * @return Whether the lowerBound field is set.
        */
+      @java.lang.Override
       public boolean hasLowerBound() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -14260,6 +14012,7 @@ public boolean hasLowerBound() {
        * required uint32 lowerBound = 1;
        * @return The lowerBound.
        */
+      @java.lang.Override
       public int getLowerBound() {
         return lowerBound_;
       }
@@ -14269,8 +14022,9 @@ public int getLowerBound() {
        * @return This builder for chaining.
        */
       public Builder setLowerBound(int value) {
-        bitField0_ |= 0x00000001;
+
         lowerBound_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -14290,6 +14044,7 @@ public Builder clearLowerBound() {
        * required uint32 upperBound = 2;
        * @return Whether the upperBound field is set.
        */
+      @java.lang.Override
       public boolean hasUpperBound() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -14297,6 +14052,7 @@ public boolean hasUpperBound() {
        * required uint32 upperBound = 2;
        * @return The upperBound.
        */
+      @java.lang.Override
       public int getUpperBound() {
         return upperBound_;
       }
@@ -14306,8 +14062,9 @@ public int getUpperBound() {
        * @return This builder for chaining.
        */
       public Builder setUpperBound(int value) {
-        bitField0_ |= 0x00000002;
+
         upperBound_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -14327,6 +14084,7 @@ public Builder clearUpperBound() {
        * required uint32 pressureThreshold = 3;
        * @return Whether the pressureThreshold field is set.
        */
+      @java.lang.Override
       public boolean hasPressureThreshold() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -14334,6 +14092,7 @@ public boolean hasPressureThreshold() {
        * required uint32 pressureThreshold = 3;
        * @return The pressureThreshold.
        */
+      @java.lang.Override
       public int getPressureThreshold() {
         return pressureThreshold_;
       }
@@ -14343,8 +14102,9 @@ public int getPressureThreshold() {
        * @return This builder for chaining.
        */
       public Builder setPressureThreshold(int value) {
-        bitField0_ |= 0x00000004;
+
         pressureThreshold_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -14364,6 +14124,7 @@ public Builder clearPressureThreshold() {
        * required double rampupRate = 4;
        * @return Whether the rampupRate field is set.
        */
+      @java.lang.Override
       public boolean hasRampupRate() {
         return ((bitField0_ & 0x00000008) != 0);
       }
@@ -14371,6 +14132,7 @@ public boolean hasRampupRate() {
        * required double rampupRate = 4;
        * @return The rampupRate.
        */
+      @java.lang.Override
       public double getRampupRate() {
         return rampupRate_;
       }
@@ -14380,8 +14142,9 @@ public double getRampupRate() {
        * @return This builder for chaining.
        */
       public Builder setRampupRate(double value) {
-        bitField0_ |= 0x00000008;
+
         rampupRate_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -14401,6 +14164,7 @@ public Builder clearRampupRate() {
        * required double backoffThreshold = 5;
        * @return Whether the backoffThreshold field is set.
        */
+      @java.lang.Override
       public boolean hasBackoffThreshold() {
         return ((bitField0_ & 0x00000010) != 0);
       }
@@ -14408,6 +14172,7 @@ public boolean hasBackoffThreshold() {
        * required double backoffThreshold = 5;
        * @return The backoffThreshold.
        */
+      @java.lang.Override
       public double getBackoffThreshold() {
         return backoffThreshold_;
       }
@@ -14417,8 +14182,9 @@ public double getBackoffThreshold() {
        * @return This builder for chaining.
        */
       public Builder setBackoffThreshold(double value) {
-        bitField0_ |= 0x00000010;
+
         backoffThreshold_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -14438,6 +14204,7 @@ public Builder clearBackoffThreshold() {
        * required double backoffRate = 6;
        * @return Whether the backoffRate field is set.
        */
+      @java.lang.Override
       public boolean hasBackoffRate() {
         return ((bitField0_ & 0x00000020) != 0);
       }
@@ -14445,6 +14212,7 @@ public boolean hasBackoffRate() {
        * required double backoffRate = 6;
        * @return The backoffRate.
        */
+      @java.lang.Override
       public double getBackoffRate() {
         return backoffRate_;
       }
@@ -14454,8 +14222,9 @@ public double getBackoffRate() {
        * @return This builder for chaining.
        */
       public Builder setBackoffRate(double value) {
-        bitField0_ |= 0x00000020;
+
         backoffRate_ = value;
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -14475,6 +14244,7 @@ public Builder clearBackoffRate() {
        * required uint32 messagesPerResize = 7;
        * @return Whether the messagesPerResize field is set.
        */
+      @java.lang.Override
       public boolean hasMessagesPerResize() {
         return ((bitField0_ & 0x00000040) != 0);
       }
@@ -14482,6 +14252,7 @@ public boolean hasMessagesPerResize() {
        * required uint32 messagesPerResize = 7;
        * @return The messagesPerResize.
        */
+      @java.lang.Override
       public int getMessagesPerResize() {
         return messagesPerResize_;
       }
@@ -14491,8 +14262,9 @@ public int getMessagesPerResize() {
        * @return This builder for chaining.
        */
       public Builder setMessagesPerResize(int value) {
-        bitField0_ |= 0x00000040;
+
         messagesPerResize_ = value;
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -14539,7 +14311,18 @@ public DefaultResizer parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new DefaultResizer(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -14598,7 +14381,7 @@ public interface FromConfigOrBuilder extends
   /**
    * Protobuf type {@code FromConfig}
    */
-  public  static final class FromConfig extends
+  public static final class FromConfig extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:FromConfig)
       FromConfigOrBuilder {
@@ -14618,68 +14401,6 @@ protected java.lang.Object newInstance(
       return new FromConfig();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private FromConfig(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = resizer_.toBuilder();
-              }
-              resizer_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(resizer_);
-                resizer_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              routerDispatcher_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.WireFormats.internal_static_FromConfig_descriptor;
@@ -14700,6 +14421,7 @@ private FromConfig(
      * optional .Payload resizer = 1;
      * @return Whether the resizer field is set.
      */
+    @java.lang.Override
     public boolean hasResizer() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -14707,22 +14429,26 @@ public boolean hasResizer() {
      * optional .Payload resizer = 1;
      * @return The resizer.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.Payload getResizer() {
       return resizer_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : resizer_;
     }
     /**
      * optional .Payload resizer = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getResizerOrBuilder() {
       return resizer_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : resizer_;
     }
 
     public static final int ROUTERDISPATCHER_FIELD_NUMBER = 2;
-    private volatile java.lang.Object routerDispatcher_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object routerDispatcher_ = "";
     /**
      * optional string routerDispatcher = 2;
      * @return Whether the routerDispatcher field is set.
      */
+    @java.lang.Override
     public boolean hasRouterDispatcher() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -14730,6 +14456,7 @@ public boolean hasRouterDispatcher() {
      * optional string routerDispatcher = 2;
      * @return The routerDispatcher.
      */
+    @java.lang.Override
     public java.lang.String getRouterDispatcher() {
       java.lang.Object ref = routerDispatcher_;
       if (ref instanceof java.lang.String) {
@@ -14748,6 +14475,7 @@ public java.lang.String getRouterDispatcher() {
      * optional string routerDispatcher = 2;
      * @return The bytes for routerDispatcher.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getRouterDispatcherBytes() {
       java.lang.Object ref = routerDispatcher_;
@@ -14788,7 +14516,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, routerDispatcher_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -14804,7 +14532,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000002) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, routerDispatcher_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -14829,7 +14557,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getRouterDispatcher()
             .equals(other.getRouterDispatcher())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -14848,7 +14576,7 @@ public int hashCode() {
         hash = (37 * hash) + ROUTERDISPATCHER_FIELD_NUMBER;
         hash = (53 * hash) + getRouterDispatcher().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -14897,11 +14625,13 @@ public static org.apache.pekko.remote.WireFormats.FromConfig parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.WireFormats.FromConfig parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.WireFormats.FromConfig parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -14982,14 +14712,13 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (resizerBuilder_ == null) {
-          resizer_ = null;
-        } else {
-          resizerBuilder_.clear();
+        bitField0_ = 0;
+        resizer_ = null;
+        if (resizerBuilder_ != null) {
+          resizerBuilder_.dispose();
+          resizerBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         routerDispatcher_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -15016,23 +14745,25 @@ public org.apache.pekko.remote.WireFormats.FromConfig build() {
       @java.lang.Override
       public org.apache.pekko.remote.WireFormats.FromConfig buildPartial() {
         org.apache.pekko.remote.WireFormats.FromConfig result = new org.apache.pekko.remote.WireFormats.FromConfig(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.WireFormats.FromConfig result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (resizerBuilder_ == null) {
-            result.resizer_ = resizer_;
-          } else {
-            result.resizer_ = resizerBuilder_.build();
-          }
+          result.resizer_ = resizerBuilder_ == null
+              ? resizer_
+              : resizerBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.routerDispatcher_ = routerDispatcher_;
           to_bitField0_ |= 0x00000002;
         }
-        result.routerDispatcher_ = routerDispatcher_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -15083,11 +14814,11 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.FromConfig other) {
           mergeResizer(other.getResizer());
         }
         if (other.hasRouterDispatcher()) {
-          bitField0_ |= 0x00000002;
           routerDispatcher_ = other.routerDispatcher_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -15107,17 +14838,42 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.WireFormats.FromConfig parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getResizerFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                routerDispatcher_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.WireFormats.FromConfig) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -15152,11 +14908,11 @@ public Builder setResizer(org.apache.pekko.remote.ContainerFormats.Payload value
             throw new NullPointerException();
           }
           resizer_ = value;
-          onChanged();
         } else {
           resizerBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -15166,11 +14922,11 @@ public Builder setResizer(
           org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (resizerBuilder_ == null) {
           resizer_ = builderForValue.build();
-          onChanged();
         } else {
           resizerBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -15179,31 +14935,32 @@ public Builder setResizer(
       public Builder mergeResizer(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (resizerBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              resizer_ != null &&
-              resizer_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
-            resizer_ =
-              org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(resizer_).mergeFrom(value).buildPartial();
+            resizer_ != null &&
+            resizer_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
+            getResizerBuilder().mergeFrom(value);
           } else {
             resizer_ = value;
           }
-          onChanged();
         } else {
           resizerBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (resizer_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .Payload resizer = 1;
        */
       public Builder clearResizer() {
-        if (resizerBuilder_ == null) {
-          resizer_ = null;
-          onChanged();
-        } else {
-          resizerBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        resizer_ = null;
+        if (resizerBuilder_ != null) {
+          resizerBuilder_.dispose();
+          resizerBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -15292,11 +15049,9 @@ public java.lang.String getRouterDispatcher() {
        */
       public Builder setRouterDispatcher(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         routerDispatcher_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -15305,8 +15060,8 @@ public Builder setRouterDispatcher(
        * @return This builder for chaining.
        */
       public Builder clearRouterDispatcher() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         routerDispatcher_ = getDefaultInstance().getRouterDispatcher();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -15317,11 +15072,9 @@ public Builder clearRouterDispatcher() {
        */
       public Builder setRouterDispatcherBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         routerDispatcher_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -15358,7 +15111,18 @@ public FromConfig parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new FromConfig(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -15439,7 +15203,7 @@ public interface GenericRoutingPoolOrBuilder extends
   /**
    * Protobuf type {@code GenericRoutingPool}
    */
-  public  static final class GenericRoutingPool extends
+  public static final class GenericRoutingPool extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:GenericRoutingPool)
       GenericRoutingPoolOrBuilder {
@@ -15459,78 +15223,6 @@ protected java.lang.Object newInstance(
       return new GenericRoutingPool();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private GenericRoutingPool(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              nrOfInstances_ = input.readUInt32();
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              routerDispatcher_ = bs;
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              usePoolDispatcher_ = input.readBool();
-              break;
-            }
-            case 34: {
-              org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000008) != 0)) {
-                subBuilder = resizer_.toBuilder();
-              }
-              resizer_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(resizer_);
-                resizer_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000008;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.WireFormats.internal_static_GenericRoutingPool_descriptor;
@@ -15546,11 +15238,12 @@ private GenericRoutingPool(
 
     private int bitField0_;
     public static final int NROFINSTANCES_FIELD_NUMBER = 1;
-    private int nrOfInstances_;
+    private int nrOfInstances_ = 0;
     /**
      * required uint32 nrOfInstances = 1;
      * @return Whether the nrOfInstances field is set.
      */
+    @java.lang.Override
     public boolean hasNrOfInstances() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -15558,16 +15251,19 @@ public boolean hasNrOfInstances() {
      * required uint32 nrOfInstances = 1;
      * @return The nrOfInstances.
      */
+    @java.lang.Override
     public int getNrOfInstances() {
       return nrOfInstances_;
     }
 
     public static final int ROUTERDISPATCHER_FIELD_NUMBER = 2;
-    private volatile java.lang.Object routerDispatcher_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object routerDispatcher_ = "";
     /**
      * optional string routerDispatcher = 2;
      * @return Whether the routerDispatcher field is set.
      */
+    @java.lang.Override
     public boolean hasRouterDispatcher() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -15575,6 +15271,7 @@ public boolean hasRouterDispatcher() {
      * optional string routerDispatcher = 2;
      * @return The routerDispatcher.
      */
+    @java.lang.Override
     public java.lang.String getRouterDispatcher() {
       java.lang.Object ref = routerDispatcher_;
       if (ref instanceof java.lang.String) {
@@ -15593,6 +15290,7 @@ public java.lang.String getRouterDispatcher() {
      * optional string routerDispatcher = 2;
      * @return The bytes for routerDispatcher.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getRouterDispatcherBytes() {
       java.lang.Object ref = routerDispatcher_;
@@ -15608,11 +15306,12 @@ public java.lang.String getRouterDispatcher() {
     }
 
     public static final int USEPOOLDISPATCHER_FIELD_NUMBER = 3;
-    private boolean usePoolDispatcher_;
+    private boolean usePoolDispatcher_ = false;
     /**
      * required bool usePoolDispatcher = 3;
      * @return Whether the usePoolDispatcher field is set.
      */
+    @java.lang.Override
     public boolean hasUsePoolDispatcher() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -15620,6 +15319,7 @@ public boolean hasUsePoolDispatcher() {
      * required bool usePoolDispatcher = 3;
      * @return The usePoolDispatcher.
      */
+    @java.lang.Override
     public boolean getUsePoolDispatcher() {
       return usePoolDispatcher_;
     }
@@ -15630,6 +15330,7 @@ public boolean getUsePoolDispatcher() {
      * optional .Payload resizer = 4;
      * @return Whether the resizer field is set.
      */
+    @java.lang.Override
     public boolean hasResizer() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -15637,12 +15338,14 @@ public boolean hasResizer() {
      * optional .Payload resizer = 4;
      * @return The resizer.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.Payload getResizer() {
       return resizer_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : resizer_;
     }
     /**
      * optional .Payload resizer = 4;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getResizerOrBuilder() {
       return resizer_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : resizer_;
     }
@@ -15687,7 +15390,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeMessage(4, getResizer());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -15711,7 +15414,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(4, getResizer());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -15746,7 +15449,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getResizer()
             .equals(other.getResizer())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -15774,7 +15477,7 @@ public int hashCode() {
         hash = (37 * hash) + RESIZER_FIELD_NUMBER;
         hash = (53 * hash) + getResizer().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -15823,11 +15526,13 @@ public static org.apache.pekko.remote.WireFormats.GenericRoutingPool parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.WireFormats.GenericRoutingPool parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.WireFormats.GenericRoutingPool parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -15908,18 +15613,15 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         nrOfInstances_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000001);
         routerDispatcher_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         usePoolDispatcher_ = false;
-        bitField0_ = (bitField0_ & ~0x00000004);
-        if (resizerBuilder_ == null) {
-          resizer_ = null;
-        } else {
-          resizerBuilder_.clear();
+        resizer_ = null;
+        if (resizerBuilder_ != null) {
+          resizerBuilder_.dispose();
+          resizerBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -15946,6 +15648,12 @@ public org.apache.pekko.remote.WireFormats.GenericRoutingPool build() {
       @java.lang.Override
       public org.apache.pekko.remote.WireFormats.GenericRoutingPool buildPartial() {
         org.apache.pekko.remote.WireFormats.GenericRoutingPool result = new org.apache.pekko.remote.WireFormats.GenericRoutingPool(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.WireFormats.GenericRoutingPool result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -15953,24 +15661,20 @@ public org.apache.pekko.remote.WireFormats.GenericRoutingPool buildPartial() {
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.routerDispatcher_ = routerDispatcher_;
           to_bitField0_ |= 0x00000002;
         }
-        result.routerDispatcher_ = routerDispatcher_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.usePoolDispatcher_ = usePoolDispatcher_;
           to_bitField0_ |= 0x00000004;
         }
         if (((from_bitField0_ & 0x00000008) != 0)) {
-          if (resizerBuilder_ == null) {
-            result.resizer_ = resizer_;
-          } else {
-            result.resizer_ = resizerBuilder_.build();
-          }
+          result.resizer_ = resizerBuilder_ == null
+              ? resizer_
+              : resizerBuilder_.build();
           to_bitField0_ |= 0x00000008;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -16021,8 +15725,8 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.GenericRoutingPool
           setNrOfInstances(other.getNrOfInstances());
         }
         if (other.hasRouterDispatcher()) {
-          bitField0_ |= 0x00000002;
           routerDispatcher_ = other.routerDispatcher_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasUsePoolDispatcher()) {
@@ -16031,7 +15735,7 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.GenericRoutingPool
         if (other.hasResizer()) {
           mergeResizer(other.getResizer());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -16057,17 +15761,52 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.WireFormats.GenericRoutingPool parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                nrOfInstances_ = input.readUInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 18: {
+                routerDispatcher_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 24: {
+                usePoolDispatcher_ = input.readBool();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 34: {
+                input.readMessage(
+                    getResizerFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 34
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.WireFormats.GenericRoutingPool) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -16077,6 +15816,7 @@ public Builder mergeFrom(
        * required uint32 nrOfInstances = 1;
        * @return Whether the nrOfInstances field is set.
        */
+      @java.lang.Override
       public boolean hasNrOfInstances() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -16084,6 +15824,7 @@ public boolean hasNrOfInstances() {
        * required uint32 nrOfInstances = 1;
        * @return The nrOfInstances.
        */
+      @java.lang.Override
       public int getNrOfInstances() {
         return nrOfInstances_;
       }
@@ -16093,8 +15834,9 @@ public int getNrOfInstances() {
        * @return This builder for chaining.
        */
       public Builder setNrOfInstances(int value) {
-        bitField0_ |= 0x00000001;
+
         nrOfInstances_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -16159,11 +15901,9 @@ public java.lang.String getRouterDispatcher() {
        */
       public Builder setRouterDispatcher(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         routerDispatcher_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -16172,8 +15912,8 @@ public Builder setRouterDispatcher(
        * @return This builder for chaining.
        */
       public Builder clearRouterDispatcher() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         routerDispatcher_ = getDefaultInstance().getRouterDispatcher();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -16184,11 +15924,9 @@ public Builder clearRouterDispatcher() {
        */
       public Builder setRouterDispatcherBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         routerDispatcher_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -16198,6 +15936,7 @@ public Builder setRouterDispatcherBytes(
        * required bool usePoolDispatcher = 3;
        * @return Whether the usePoolDispatcher field is set.
        */
+      @java.lang.Override
       public boolean hasUsePoolDispatcher() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -16205,6 +15944,7 @@ public boolean hasUsePoolDispatcher() {
        * required bool usePoolDispatcher = 3;
        * @return The usePoolDispatcher.
        */
+      @java.lang.Override
       public boolean getUsePoolDispatcher() {
         return usePoolDispatcher_;
       }
@@ -16214,8 +15954,9 @@ public boolean getUsePoolDispatcher() {
        * @return This builder for chaining.
        */
       public Builder setUsePoolDispatcher(boolean value) {
-        bitField0_ |= 0x00000004;
+
         usePoolDispatcher_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -16260,11 +16001,11 @@ public Builder setResizer(org.apache.pekko.remote.ContainerFormats.Payload value
             throw new NullPointerException();
           }
           resizer_ = value;
-          onChanged();
         } else {
           resizerBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000008;
+        onChanged();
         return this;
       }
       /**
@@ -16274,11 +16015,11 @@ public Builder setResizer(
           org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (resizerBuilder_ == null) {
           resizer_ = builderForValue.build();
-          onChanged();
         } else {
           resizerBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000008;
+        onChanged();
         return this;
       }
       /**
@@ -16287,31 +16028,32 @@ public Builder setResizer(
       public Builder mergeResizer(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (resizerBuilder_ == null) {
           if (((bitField0_ & 0x00000008) != 0) &&
-              resizer_ != null &&
-              resizer_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
-            resizer_ =
-              org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(resizer_).mergeFrom(value).buildPartial();
+            resizer_ != null &&
+            resizer_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
+            getResizerBuilder().mergeFrom(value);
           } else {
             resizer_ = value;
           }
-          onChanged();
         } else {
           resizerBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000008;
+        if (resizer_ != null) {
+          bitField0_ |= 0x00000008;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .Payload resizer = 4;
        */
       public Builder clearResizer() {
-        if (resizerBuilder_ == null) {
-          resizer_ = null;
-          onChanged();
-        } else {
-          resizerBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000008);
+        resizer_ = null;
+        if (resizerBuilder_ != null) {
+          resizerBuilder_.dispose();
+          resizerBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -16382,7 +16124,18 @@ public GenericRoutingPool parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new GenericRoutingPool(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -16439,7 +16192,7 @@ public interface ScatterGatherPoolOrBuilder extends
   /**
    * Protobuf type {@code ScatterGatherPool}
    */
-  public  static final class ScatterGatherPool extends
+  public static final class ScatterGatherPool extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ScatterGatherPool)
       ScatterGatherPoolOrBuilder {
@@ -16458,75 +16211,6 @@ protected java.lang.Object newInstance(
       return new ScatterGatherPool();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ScatterGatherPool(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.WireFormats.GenericRoutingPool.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = generic_.toBuilder();
-              }
-              generic_ = input.readMessage(org.apache.pekko.remote.WireFormats.GenericRoutingPool.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(generic_);
-                generic_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.remote.WireFormats.FiniteDuration.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = within_.toBuilder();
-              }
-              within_ = input.readMessage(org.apache.pekko.remote.WireFormats.FiniteDuration.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(within_);
-                within_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.WireFormats.internal_static_ScatterGatherPool_descriptor;
@@ -16547,6 +16231,7 @@ private ScatterGatherPool(
      * required .GenericRoutingPool generic = 1;
      * @return Whether the generic field is set.
      */
+    @java.lang.Override
     public boolean hasGeneric() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -16554,12 +16239,14 @@ public boolean hasGeneric() {
      * required .GenericRoutingPool generic = 1;
      * @return The generic.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.GenericRoutingPool getGeneric() {
       return generic_ == null ? org.apache.pekko.remote.WireFormats.GenericRoutingPool.getDefaultInstance() : generic_;
     }
     /**
      * required .GenericRoutingPool generic = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.GenericRoutingPoolOrBuilder getGenericOrBuilder() {
       return generic_ == null ? org.apache.pekko.remote.WireFormats.GenericRoutingPool.getDefaultInstance() : generic_;
     }
@@ -16570,6 +16257,7 @@ public org.apache.pekko.remote.WireFormats.GenericRoutingPoolOrBuilder getGeneri
      * required .FiniteDuration within = 2;
      * @return Whether the within field is set.
      */
+    @java.lang.Override
     public boolean hasWithin() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -16577,12 +16265,14 @@ public boolean hasWithin() {
      * required .FiniteDuration within = 2;
      * @return The within.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.FiniteDuration getWithin() {
       return within_ == null ? org.apache.pekko.remote.WireFormats.FiniteDuration.getDefaultInstance() : within_;
     }
     /**
      * required .FiniteDuration within = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.FiniteDurationOrBuilder getWithinOrBuilder() {
       return within_ == null ? org.apache.pekko.remote.WireFormats.FiniteDuration.getDefaultInstance() : within_;
     }
@@ -16623,7 +16313,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getWithin());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -16640,7 +16330,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getWithin());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -16665,7 +16355,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getWithin()
             .equals(other.getWithin())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -16684,7 +16374,7 @@ public int hashCode() {
         hash = (37 * hash) + WITHIN_FIELD_NUMBER;
         hash = (53 * hash) + getWithin().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -16733,11 +16423,13 @@ public static org.apache.pekko.remote.WireFormats.ScatterGatherPool parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.WireFormats.ScatterGatherPool parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.WireFormats.ScatterGatherPool parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -16819,18 +16511,17 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (genericBuilder_ == null) {
-          generic_ = null;
-        } else {
-          genericBuilder_.clear();
+        bitField0_ = 0;
+        generic_ = null;
+        if (genericBuilder_ != null) {
+          genericBuilder_.dispose();
+          genericBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (withinBuilder_ == null) {
-          within_ = null;
-        } else {
-          withinBuilder_.clear();
+        within_ = null;
+        if (withinBuilder_ != null) {
+          withinBuilder_.dispose();
+          withinBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -16857,27 +16548,27 @@ public org.apache.pekko.remote.WireFormats.ScatterGatherPool build() {
       @java.lang.Override
       public org.apache.pekko.remote.WireFormats.ScatterGatherPool buildPartial() {
         org.apache.pekko.remote.WireFormats.ScatterGatherPool result = new org.apache.pekko.remote.WireFormats.ScatterGatherPool(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.WireFormats.ScatterGatherPool result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (genericBuilder_ == null) {
-            result.generic_ = generic_;
-          } else {
-            result.generic_ = genericBuilder_.build();
-          }
+          result.generic_ = genericBuilder_ == null
+              ? generic_
+              : genericBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (withinBuilder_ == null) {
-            result.within_ = within_;
-          } else {
-            result.within_ = withinBuilder_.build();
-          }
+          result.within_ = withinBuilder_ == null
+              ? within_
+              : withinBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -16930,7 +16621,7 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.ScatterGatherPool o
         if (other.hasWithin()) {
           mergeWithin(other.getWithin());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -16957,17 +16648,44 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.WireFormats.ScatterGatherPool parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getGenericFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getWithinFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.WireFormats.ScatterGatherPool) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -17002,11 +16720,11 @@ public Builder setGeneric(org.apache.pekko.remote.WireFormats.GenericRoutingPool
             throw new NullPointerException();
           }
           generic_ = value;
-          onChanged();
         } else {
           genericBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -17016,11 +16734,11 @@ public Builder setGeneric(
           org.apache.pekko.remote.WireFormats.GenericRoutingPool.Builder builderForValue) {
         if (genericBuilder_ == null) {
           generic_ = builderForValue.build();
-          onChanged();
         } else {
           genericBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -17029,31 +16747,32 @@ public Builder setGeneric(
       public Builder mergeGeneric(org.apache.pekko.remote.WireFormats.GenericRoutingPool value) {
         if (genericBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              generic_ != null &&
-              generic_ != org.apache.pekko.remote.WireFormats.GenericRoutingPool.getDefaultInstance()) {
-            generic_ =
-              org.apache.pekko.remote.WireFormats.GenericRoutingPool.newBuilder(generic_).mergeFrom(value).buildPartial();
+            generic_ != null &&
+            generic_ != org.apache.pekko.remote.WireFormats.GenericRoutingPool.getDefaultInstance()) {
+            getGenericBuilder().mergeFrom(value);
           } else {
             generic_ = value;
           }
-          onChanged();
         } else {
           genericBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (generic_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .GenericRoutingPool generic = 1;
        */
       public Builder clearGeneric() {
-        if (genericBuilder_ == null) {
-          generic_ = null;
-          onChanged();
-        } else {
-          genericBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        generic_ = null;
+        if (genericBuilder_ != null) {
+          genericBuilder_.dispose();
+          genericBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -17122,11 +16841,11 @@ public Builder setWithin(org.apache.pekko.remote.WireFormats.FiniteDuration valu
             throw new NullPointerException();
           }
           within_ = value;
-          onChanged();
         } else {
           withinBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -17136,11 +16855,11 @@ public Builder setWithin(
           org.apache.pekko.remote.WireFormats.FiniteDuration.Builder builderForValue) {
         if (withinBuilder_ == null) {
           within_ = builderForValue.build();
-          onChanged();
         } else {
           withinBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -17149,31 +16868,32 @@ public Builder setWithin(
       public Builder mergeWithin(org.apache.pekko.remote.WireFormats.FiniteDuration value) {
         if (withinBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              within_ != null &&
-              within_ != org.apache.pekko.remote.WireFormats.FiniteDuration.getDefaultInstance()) {
-            within_ =
-              org.apache.pekko.remote.WireFormats.FiniteDuration.newBuilder(within_).mergeFrom(value).buildPartial();
+            within_ != null &&
+            within_ != org.apache.pekko.remote.WireFormats.FiniteDuration.getDefaultInstance()) {
+            getWithinBuilder().mergeFrom(value);
           } else {
             within_ = value;
           }
-          onChanged();
         } else {
           withinBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (within_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .FiniteDuration within = 2;
        */
       public Builder clearWithin() {
-        if (withinBuilder_ == null) {
-          within_ = null;
-          onChanged();
-        } else {
-          withinBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        within_ = null;
+        if (withinBuilder_ != null) {
+          withinBuilder_.dispose();
+          withinBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -17244,7 +16964,18 @@ public ScatterGatherPool parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ScatterGatherPool(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -17316,7 +17047,7 @@ public interface TailChoppingPoolOrBuilder extends
   /**
    * Protobuf type {@code TailChoppingPool}
    */
-  public  static final class TailChoppingPool extends
+  public static final class TailChoppingPool extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:TailChoppingPool)
       TailChoppingPoolOrBuilder {
@@ -17335,88 +17066,6 @@ protected java.lang.Object newInstance(
       return new TailChoppingPool();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private TailChoppingPool(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.WireFormats.GenericRoutingPool.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = generic_.toBuilder();
-              }
-              generic_ = input.readMessage(org.apache.pekko.remote.WireFormats.GenericRoutingPool.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(generic_);
-                generic_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.remote.WireFormats.FiniteDuration.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = within_.toBuilder();
-              }
-              within_ = input.readMessage(org.apache.pekko.remote.WireFormats.FiniteDuration.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(within_);
-                within_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            case 26: {
-              org.apache.pekko.remote.WireFormats.FiniteDuration.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000004) != 0)) {
-                subBuilder = interval_.toBuilder();
-              }
-              interval_ = input.readMessage(org.apache.pekko.remote.WireFormats.FiniteDuration.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(interval_);
-                interval_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000004;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.WireFormats.internal_static_TailChoppingPool_descriptor;
@@ -17437,6 +17086,7 @@ private TailChoppingPool(
      * required .GenericRoutingPool generic = 1;
      * @return Whether the generic field is set.
      */
+    @java.lang.Override
     public boolean hasGeneric() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -17444,12 +17094,14 @@ public boolean hasGeneric() {
      * required .GenericRoutingPool generic = 1;
      * @return The generic.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.GenericRoutingPool getGeneric() {
       return generic_ == null ? org.apache.pekko.remote.WireFormats.GenericRoutingPool.getDefaultInstance() : generic_;
     }
     /**
      * required .GenericRoutingPool generic = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.GenericRoutingPoolOrBuilder getGenericOrBuilder() {
       return generic_ == null ? org.apache.pekko.remote.WireFormats.GenericRoutingPool.getDefaultInstance() : generic_;
     }
@@ -17460,6 +17112,7 @@ public org.apache.pekko.remote.WireFormats.GenericRoutingPoolOrBuilder getGeneri
      * required .FiniteDuration within = 2;
      * @return Whether the within field is set.
      */
+    @java.lang.Override
     public boolean hasWithin() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -17467,12 +17120,14 @@ public boolean hasWithin() {
      * required .FiniteDuration within = 2;
      * @return The within.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.FiniteDuration getWithin() {
       return within_ == null ? org.apache.pekko.remote.WireFormats.FiniteDuration.getDefaultInstance() : within_;
     }
     /**
      * required .FiniteDuration within = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.FiniteDurationOrBuilder getWithinOrBuilder() {
       return within_ == null ? org.apache.pekko.remote.WireFormats.FiniteDuration.getDefaultInstance() : within_;
     }
@@ -17483,6 +17138,7 @@ public org.apache.pekko.remote.WireFormats.FiniteDurationOrBuilder getWithinOrBu
      * required .FiniteDuration interval = 3;
      * @return Whether the interval field is set.
      */
+    @java.lang.Override
     public boolean hasInterval() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -17490,12 +17146,14 @@ public boolean hasInterval() {
      * required .FiniteDuration interval = 3;
      * @return The interval.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.FiniteDuration getInterval() {
       return interval_ == null ? org.apache.pekko.remote.WireFormats.FiniteDuration.getDefaultInstance() : interval_;
     }
     /**
      * required .FiniteDuration interval = 3;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.FiniteDurationOrBuilder getIntervalOrBuilder() {
       return interval_ == null ? org.apache.pekko.remote.WireFormats.FiniteDuration.getDefaultInstance() : interval_;
     }
@@ -17547,7 +17205,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeMessage(3, getInterval());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -17568,7 +17226,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, getInterval());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -17598,7 +17256,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getInterval()
             .equals(other.getInterval())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -17621,7 +17279,7 @@ public int hashCode() {
         hash = (37 * hash) + INTERVAL_FIELD_NUMBER;
         hash = (53 * hash) + getInterval().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -17670,11 +17328,13 @@ public static org.apache.pekko.remote.WireFormats.TailChoppingPool parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.WireFormats.TailChoppingPool parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.WireFormats.TailChoppingPool parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -17755,26 +17415,24 @@ private void maybeForceBuilderInitialization() {
         }
       }
       @java.lang.Override
-      public Builder clear() {
-        super.clear();
-        if (genericBuilder_ == null) {
-          generic_ = null;
-        } else {
-          genericBuilder_.clear();
+      public Builder clear() {
+        super.clear();
+        bitField0_ = 0;
+        generic_ = null;
+        if (genericBuilder_ != null) {
+          genericBuilder_.dispose();
+          genericBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (withinBuilder_ == null) {
-          within_ = null;
-        } else {
-          withinBuilder_.clear();
+        within_ = null;
+        if (withinBuilder_ != null) {
+          withinBuilder_.dispose();
+          withinBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        if (intervalBuilder_ == null) {
-          interval_ = null;
-        } else {
-          intervalBuilder_.clear();
+        interval_ = null;
+        if (intervalBuilder_ != null) {
+          intervalBuilder_.dispose();
+          intervalBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -17801,35 +17459,33 @@ public org.apache.pekko.remote.WireFormats.TailChoppingPool build() {
       @java.lang.Override
       public org.apache.pekko.remote.WireFormats.TailChoppingPool buildPartial() {
         org.apache.pekko.remote.WireFormats.TailChoppingPool result = new org.apache.pekko.remote.WireFormats.TailChoppingPool(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.WireFormats.TailChoppingPool result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (genericBuilder_ == null) {
-            result.generic_ = generic_;
-          } else {
-            result.generic_ = genericBuilder_.build();
-          }
+          result.generic_ = genericBuilder_ == null
+              ? generic_
+              : genericBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (withinBuilder_ == null) {
-            result.within_ = within_;
-          } else {
-            result.within_ = withinBuilder_.build();
-          }
+          result.within_ = withinBuilder_ == null
+              ? within_
+              : withinBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
-          if (intervalBuilder_ == null) {
-            result.interval_ = interval_;
-          } else {
-            result.interval_ = intervalBuilder_.build();
-          }
+          result.interval_ = intervalBuilder_ == null
+              ? interval_
+              : intervalBuilder_.build();
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -17885,7 +17541,7 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.TailChoppingPool ot
         if (other.hasInterval()) {
           mergeInterval(other.getInterval());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -17918,17 +17574,51 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.WireFormats.TailChoppingPool parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getGenericFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getWithinFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 26: {
+                input.readMessage(
+                    getIntervalFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.WireFormats.TailChoppingPool) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -17963,11 +17653,11 @@ public Builder setGeneric(org.apache.pekko.remote.WireFormats.GenericRoutingPool
             throw new NullPointerException();
           }
           generic_ = value;
-          onChanged();
         } else {
           genericBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -17977,11 +17667,11 @@ public Builder setGeneric(
           org.apache.pekko.remote.WireFormats.GenericRoutingPool.Builder builderForValue) {
         if (genericBuilder_ == null) {
           generic_ = builderForValue.build();
-          onChanged();
         } else {
           genericBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -17990,31 +17680,32 @@ public Builder setGeneric(
       public Builder mergeGeneric(org.apache.pekko.remote.WireFormats.GenericRoutingPool value) {
         if (genericBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              generic_ != null &&
-              generic_ != org.apache.pekko.remote.WireFormats.GenericRoutingPool.getDefaultInstance()) {
-            generic_ =
-              org.apache.pekko.remote.WireFormats.GenericRoutingPool.newBuilder(generic_).mergeFrom(value).buildPartial();
+            generic_ != null &&
+            generic_ != org.apache.pekko.remote.WireFormats.GenericRoutingPool.getDefaultInstance()) {
+            getGenericBuilder().mergeFrom(value);
           } else {
             generic_ = value;
           }
-          onChanged();
         } else {
           genericBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (generic_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .GenericRoutingPool generic = 1;
        */
       public Builder clearGeneric() {
-        if (genericBuilder_ == null) {
-          generic_ = null;
-          onChanged();
-        } else {
-          genericBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        generic_ = null;
+        if (genericBuilder_ != null) {
+          genericBuilder_.dispose();
+          genericBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -18083,11 +17774,11 @@ public Builder setWithin(org.apache.pekko.remote.WireFormats.FiniteDuration valu
             throw new NullPointerException();
           }
           within_ = value;
-          onChanged();
         } else {
           withinBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -18097,11 +17788,11 @@ public Builder setWithin(
           org.apache.pekko.remote.WireFormats.FiniteDuration.Builder builderForValue) {
         if (withinBuilder_ == null) {
           within_ = builderForValue.build();
-          onChanged();
         } else {
           withinBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -18110,31 +17801,32 @@ public Builder setWithin(
       public Builder mergeWithin(org.apache.pekko.remote.WireFormats.FiniteDuration value) {
         if (withinBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              within_ != null &&
-              within_ != org.apache.pekko.remote.WireFormats.FiniteDuration.getDefaultInstance()) {
-            within_ =
-              org.apache.pekko.remote.WireFormats.FiniteDuration.newBuilder(within_).mergeFrom(value).buildPartial();
+            within_ != null &&
+            within_ != org.apache.pekko.remote.WireFormats.FiniteDuration.getDefaultInstance()) {
+            getWithinBuilder().mergeFrom(value);
           } else {
             within_ = value;
           }
-          onChanged();
         } else {
           withinBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (within_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .FiniteDuration within = 2;
        */
       public Builder clearWithin() {
-        if (withinBuilder_ == null) {
-          within_ = null;
-          onChanged();
-        } else {
-          withinBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        within_ = null;
+        if (withinBuilder_ != null) {
+          withinBuilder_.dispose();
+          withinBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -18203,11 +17895,11 @@ public Builder setInterval(org.apache.pekko.remote.WireFormats.FiniteDuration va
             throw new NullPointerException();
           }
           interval_ = value;
-          onChanged();
         } else {
           intervalBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -18217,11 +17909,11 @@ public Builder setInterval(
           org.apache.pekko.remote.WireFormats.FiniteDuration.Builder builderForValue) {
         if (intervalBuilder_ == null) {
           interval_ = builderForValue.build();
-          onChanged();
         } else {
           intervalBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -18230,31 +17922,32 @@ public Builder setInterval(
       public Builder mergeInterval(org.apache.pekko.remote.WireFormats.FiniteDuration value) {
         if (intervalBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
-              interval_ != null &&
-              interval_ != org.apache.pekko.remote.WireFormats.FiniteDuration.getDefaultInstance()) {
-            interval_ =
-              org.apache.pekko.remote.WireFormats.FiniteDuration.newBuilder(interval_).mergeFrom(value).buildPartial();
+            interval_ != null &&
+            interval_ != org.apache.pekko.remote.WireFormats.FiniteDuration.getDefaultInstance()) {
+            getIntervalBuilder().mergeFrom(value);
           } else {
             interval_ = value;
           }
-          onChanged();
         } else {
           intervalBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000004;
+        if (interval_ != null) {
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .FiniteDuration interval = 3;
        */
       public Builder clearInterval() {
-        if (intervalBuilder_ == null) {
-          interval_ = null;
-          onChanged();
-        } else {
-          intervalBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000004);
+        interval_ = null;
+        if (intervalBuilder_ != null) {
+          intervalBuilder_.dispose();
+          intervalBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -18325,7 +18018,18 @@ public TailChoppingPool parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new TailChoppingPool(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -18419,7 +18123,7 @@ public interface AddressDataOrBuilder extends
    *
    * Protobuf type {@code AddressData}
    */
-  public  static final class AddressData extends
+  public static final class AddressData extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:AddressData)
       AddressDataOrBuilder {
@@ -18441,72 +18145,6 @@ protected java.lang.Object newInstance(
       return new AddressData();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private AddressData(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              system_ = bs;
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              hostname_ = bs;
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              port_ = input.readUInt32();
-              break;
-            }
-            case 34: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000008;
-              protocol_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.WireFormats.internal_static_AddressData_descriptor;
@@ -18522,11 +18160,13 @@ private AddressData(
 
     private int bitField0_;
     public static final int SYSTEM_FIELD_NUMBER = 1;
-    private volatile java.lang.Object system_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object system_ = "";
     /**
      * required string system = 1;
      * @return Whether the system field is set.
      */
+    @java.lang.Override
     public boolean hasSystem() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -18534,6 +18174,7 @@ public boolean hasSystem() {
      * required string system = 1;
      * @return The system.
      */
+    @java.lang.Override
     public java.lang.String getSystem() {
       java.lang.Object ref = system_;
       if (ref instanceof java.lang.String) {
@@ -18552,6 +18193,7 @@ public java.lang.String getSystem() {
      * required string system = 1;
      * @return The bytes for system.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getSystemBytes() {
       java.lang.Object ref = system_;
@@ -18567,11 +18209,13 @@ public java.lang.String getSystem() {
     }
 
     public static final int HOSTNAME_FIELD_NUMBER = 2;
-    private volatile java.lang.Object hostname_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object hostname_ = "";
     /**
      * required string hostname = 2;
      * @return Whether the hostname field is set.
      */
+    @java.lang.Override
     public boolean hasHostname() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -18579,6 +18223,7 @@ public boolean hasHostname() {
      * required string hostname = 2;
      * @return The hostname.
      */
+    @java.lang.Override
     public java.lang.String getHostname() {
       java.lang.Object ref = hostname_;
       if (ref instanceof java.lang.String) {
@@ -18597,6 +18242,7 @@ public java.lang.String getHostname() {
      * required string hostname = 2;
      * @return The bytes for hostname.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getHostnameBytes() {
       java.lang.Object ref = hostname_;
@@ -18612,11 +18258,12 @@ public java.lang.String getHostname() {
     }
 
     public static final int PORT_FIELD_NUMBER = 3;
-    private int port_;
+    private int port_ = 0;
     /**
      * required uint32 port = 3;
      * @return Whether the port field is set.
      */
+    @java.lang.Override
     public boolean hasPort() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -18624,16 +18271,19 @@ public boolean hasPort() {
      * required uint32 port = 3;
      * @return The port.
      */
+    @java.lang.Override
     public int getPort() {
       return port_;
     }
 
     public static final int PROTOCOL_FIELD_NUMBER = 4;
-    private volatile java.lang.Object protocol_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object protocol_ = "";
     /**
      * optional string protocol = 4;
      * @return Whether the protocol field is set.
      */
+    @java.lang.Override
     public boolean hasProtocol() {
       return ((bitField0_ & 0x00000008) != 0);
     }
@@ -18641,6 +18291,7 @@ public boolean hasProtocol() {
      * optional string protocol = 4;
      * @return The protocol.
      */
+    @java.lang.Override
     public java.lang.String getProtocol() {
       java.lang.Object ref = protocol_;
       if (ref instanceof java.lang.String) {
@@ -18659,6 +18310,7 @@ public java.lang.String getProtocol() {
      * optional string protocol = 4;
      * @return The bytes for protocol.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getProtocolBytes() {
       java.lang.Object ref = protocol_;
@@ -18711,7 +18363,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000008) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, protocol_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -18733,7 +18385,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000008) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(4, protocol_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -18768,7 +18420,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getProtocol()
             .equals(other.getProtocol())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -18795,7 +18447,7 @@ public int hashCode() {
         hash = (37 * hash) + PROTOCOL_FIELD_NUMBER;
         hash = (53 * hash) + getProtocol().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -18844,11 +18496,13 @@ public static org.apache.pekko.remote.WireFormats.AddressData parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.WireFormats.AddressData parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.WireFormats.AddressData parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -18917,30 +18571,22 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.WireFormats.AddressData.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         system_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         hostname_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         port_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000004);
         protocol_ = "";
-        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -18967,27 +18613,31 @@ public org.apache.pekko.remote.WireFormats.AddressData build() {
       @java.lang.Override
       public org.apache.pekko.remote.WireFormats.AddressData buildPartial() {
         org.apache.pekko.remote.WireFormats.AddressData result = new org.apache.pekko.remote.WireFormats.AddressData(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.WireFormats.AddressData result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.system_ = system_;
           to_bitField0_ |= 0x00000001;
         }
-        result.system_ = system_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.hostname_ = hostname_;
           to_bitField0_ |= 0x00000002;
         }
-        result.hostname_ = hostname_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.port_ = port_;
           to_bitField0_ |= 0x00000004;
         }
         if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.protocol_ = protocol_;
           to_bitField0_ |= 0x00000008;
         }
-        result.protocol_ = protocol_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -19035,24 +18685,24 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.remote.WireFormats.AddressData other) {
         if (other == org.apache.pekko.remote.WireFormats.AddressData.getDefaultInstance()) return this;
         if (other.hasSystem()) {
-          bitField0_ |= 0x00000001;
           system_ = other.system_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasHostname()) {
-          bitField0_ |= 0x00000002;
           hostname_ = other.hostname_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasPort()) {
           setPort(other.getPort());
         }
         if (other.hasProtocol()) {
-          bitField0_ |= 0x00000008;
           protocol_ = other.protocol_;
+          bitField0_ |= 0x00000008;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -19076,17 +18726,50 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.WireFormats.AddressData parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                system_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                hostname_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 24: {
+                port_ = input.readUInt32();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 34: {
+                protocol_ = input.readBytes();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 34
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.WireFormats.AddressData) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -19141,11 +18824,9 @@ public java.lang.String getSystem() {
        */
       public Builder setSystem(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         system_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -19154,8 +18835,8 @@ public Builder setSystem(
        * @return This builder for chaining.
        */
       public Builder clearSystem() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         system_ = getDefaultInstance().getSystem();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -19166,11 +18847,9 @@ public Builder clearSystem() {
        */
       public Builder setSystemBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         system_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -19225,11 +18904,9 @@ public java.lang.String getHostname() {
        */
       public Builder setHostname(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         hostname_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -19238,8 +18915,8 @@ public Builder setHostname(
        * @return This builder for chaining.
        */
       public Builder clearHostname() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         hostname_ = getDefaultInstance().getHostname();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -19250,11 +18927,9 @@ public Builder clearHostname() {
        */
       public Builder setHostnameBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         hostname_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -19264,6 +18939,7 @@ public Builder setHostnameBytes(
        * required uint32 port = 3;
        * @return Whether the port field is set.
        */
+      @java.lang.Override
       public boolean hasPort() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -19271,6 +18947,7 @@ public boolean hasPort() {
        * required uint32 port = 3;
        * @return The port.
        */
+      @java.lang.Override
       public int getPort() {
         return port_;
       }
@@ -19280,8 +18957,9 @@ public int getPort() {
        * @return This builder for chaining.
        */
       public Builder setPort(int value) {
-        bitField0_ |= 0x00000004;
+
         port_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -19346,11 +19024,9 @@ public java.lang.String getProtocol() {
        */
       public Builder setProtocol(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
+        if (value == null) { throw new NullPointerException(); }
         protocol_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -19359,8 +19035,8 @@ public Builder setProtocol(
        * @return This builder for chaining.
        */
       public Builder clearProtocol() {
-        bitField0_ = (bitField0_ & ~0x00000008);
         protocol_ = getDefaultInstance().getProtocol();
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
@@ -19371,11 +19047,9 @@ public Builder clearProtocol() {
        */
       public Builder setProtocolBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
+        if (value == null) { throw new NullPointerException(); }
         protocol_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -19412,7 +19086,18 @@ public AddressData parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new AddressData(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -19478,7 +19163,7 @@ org.apache.pekko.remote.WireFormats.AddressDataOrBuilder getNodesOrBuilder(
   /**
    * Protobuf type {@code RemoteRouterConfig}
    */
-  public  static final class RemoteRouterConfig extends
+  public static final class RemoteRouterConfig extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:RemoteRouterConfig)
       RemoteRouterConfigOrBuilder {
@@ -19498,74 +19183,6 @@ protected java.lang.Object newInstance(
       return new RemoteRouterConfig();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private RemoteRouterConfig(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = local_.toBuilder();
-              }
-              local_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(local_);
-                local_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                nodes_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              nodes_.add(
-                  input.readMessage(org.apache.pekko.remote.WireFormats.AddressData.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          nodes_ = java.util.Collections.unmodifiableList(nodes_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.WireFormats.internal_static_RemoteRouterConfig_descriptor;
@@ -19586,6 +19203,7 @@ private RemoteRouterConfig(
      * required .Payload local = 1;
      * @return Whether the local field is set.
      */
+    @java.lang.Override
     public boolean hasLocal() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -19593,27 +19211,32 @@ public boolean hasLocal() {
      * required .Payload local = 1;
      * @return The local.
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.Payload getLocal() {
       return local_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : local_;
     }
     /**
      * required .Payload local = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getLocalOrBuilder() {
       return local_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : local_;
     }
 
     public static final int NODES_FIELD_NUMBER = 2;
+    @SuppressWarnings("serial")
     private java.util.List nodes_;
     /**
      * repeated .AddressData nodes = 2;
      */
+    @java.lang.Override
     public java.util.List getNodesList() {
       return nodes_;
     }
     /**
      * repeated .AddressData nodes = 2;
      */
+    @java.lang.Override
     public java.util.List 
         getNodesOrBuilderList() {
       return nodes_;
@@ -19621,18 +19244,21 @@ public java.util.List getNodesL
     /**
      * repeated .AddressData nodes = 2;
      */
+    @java.lang.Override
     public int getNodesCount() {
       return nodes_.size();
     }
     /**
      * repeated .AddressData nodes = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.AddressData getNodes(int index) {
       return nodes_.get(index);
     }
     /**
      * repeated .AddressData nodes = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.remote.WireFormats.AddressDataOrBuilder getNodesOrBuilder(
         int index) {
       return nodes_.get(index);
@@ -19672,7 +19298,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       for (int i = 0; i < nodes_.size(); i++) {
         output.writeMessage(2, nodes_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -19689,7 +19315,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, nodes_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -19711,7 +19337,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getNodesList()
           .equals(other.getNodesList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -19730,7 +19356,7 @@ public int hashCode() {
         hash = (37 * hash) + NODES_FIELD_NUMBER;
         hash = (53 * hash) + getNodesList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -19779,11 +19405,13 @@ public static org.apache.pekko.remote.WireFormats.RemoteRouterConfig parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.WireFormats.RemoteRouterConfig parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.WireFormats.RemoteRouterConfig parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -19865,18 +19493,19 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (localBuilder_ == null) {
-          local_ = null;
-        } else {
-          localBuilder_.clear();
+        bitField0_ = 0;
+        local_ = null;
+        if (localBuilder_ != null) {
+          localBuilder_.dispose();
+          localBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         if (nodesBuilder_ == null) {
           nodes_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
+          nodes_ = null;
           nodesBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -19903,16 +19532,13 @@ public org.apache.pekko.remote.WireFormats.RemoteRouterConfig build() {
       @java.lang.Override
       public org.apache.pekko.remote.WireFormats.RemoteRouterConfig buildPartial() {
         org.apache.pekko.remote.WireFormats.RemoteRouterConfig result = new org.apache.pekko.remote.WireFormats.RemoteRouterConfig(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (localBuilder_ == null) {
-            result.local_ = local_;
-          } else {
-            result.local_ = localBuilder_.build();
-          }
-          to_bitField0_ |= 0x00000001;
-        }
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.apache.pekko.remote.WireFormats.RemoteRouterConfig result) {
         if (nodesBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
             nodes_ = java.util.Collections.unmodifiableList(nodes_);
@@ -19922,9 +19548,18 @@ public org.apache.pekko.remote.WireFormats.RemoteRouterConfig buildPartial() {
         } else {
           result.nodes_ = nodesBuilder_.build();
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.WireFormats.RemoteRouterConfig result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.local_ = localBuilder_ == null
+              ? local_
+              : localBuilder_.build();
+          to_bitField0_ |= 0x00000001;
+        }
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -20000,7 +19635,7 @@ public Builder mergeFrom(org.apache.pekko.remote.WireFormats.RemoteRouterConfig
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -20026,17 +19661,50 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.WireFormats.RemoteRouterConfig parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getLocalFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                org.apache.pekko.remote.WireFormats.AddressData m =
+                    input.readMessage(
+                        org.apache.pekko.remote.WireFormats.AddressData.PARSER,
+                        extensionRegistry);
+                if (nodesBuilder_ == null) {
+                  ensureNodesIsMutable();
+                  nodes_.add(m);
+                } else {
+                  nodesBuilder_.addMessage(m);
+                }
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.WireFormats.RemoteRouterConfig) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -20071,11 +19739,11 @@ public Builder setLocal(org.apache.pekko.remote.ContainerFormats.Payload value)
             throw new NullPointerException();
           }
           local_ = value;
-          onChanged();
         } else {
           localBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -20085,11 +19753,11 @@ public Builder setLocal(
           org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (localBuilder_ == null) {
           local_ = builderForValue.build();
-          onChanged();
         } else {
           localBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -20098,31 +19766,32 @@ public Builder setLocal(
       public Builder mergeLocal(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (localBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              local_ != null &&
-              local_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
-            local_ =
-              org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(local_).mergeFrom(value).buildPartial();
+            local_ != null &&
+            local_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
+            getLocalBuilder().mergeFrom(value);
           } else {
             local_ = value;
           }
-          onChanged();
         } else {
           localBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (local_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Payload local = 1;
        */
       public Builder clearLocal() {
-        if (localBuilder_ == null) {
-          local_ = null;
-          onChanged();
-        } else {
-          localBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        local_ = null;
+        if (localBuilder_ != null) {
+          localBuilder_.dispose();
+          localBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -20433,7 +20102,18 @@ public RemoteRouterConfig parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new RemoteRouterConfig(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
diff --git a/remote/src/test/java/org/apache/pekko/remote/ProtobufProtocol.java b/remote/src/test/java/org/apache/pekko/remote/ProtobufProtocol.java
index b65c930c474..a52de21f279 100644
--- a/remote/src/test/java/org/apache/pekko/remote/ProtobufProtocol.java
+++ b/remote/src/test/java/org/apache/pekko/remote/ProtobufProtocol.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2021-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ProtobufProtocol.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.remote;
 
 public final class ProtobufProtocol {
@@ -73,7 +74,7 @@ public interface MyMessageOrBuilder extends
   /**
    * Protobuf type {@code MyMessage}
    */
-  public  static final class MyMessage extends
+  public static final class MyMessage extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:MyMessage)
       MyMessageOrBuilder {
@@ -93,65 +94,6 @@ protected java.lang.Object newInstance(
       return new MyMessage();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private MyMessage(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              id_ = input.readUInt64();
-              break;
-            }
-            case 18: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              name_ = bs;
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              status_ = input.readBool();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.ProtobufProtocol.internal_static_MyMessage_descriptor;
@@ -167,11 +109,12 @@ private MyMessage(
 
     private int bitField0_;
     public static final int ID_FIELD_NUMBER = 1;
-    private long id_;
+    private long id_ = 0L;
     /**
      * required uint64 id = 1;
      * @return Whether the id field is set.
      */
+    @java.lang.Override
     public boolean hasId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -179,16 +122,19 @@ public boolean hasId() {
      * required uint64 id = 1;
      * @return The id.
      */
+    @java.lang.Override
     public long getId() {
       return id_;
     }
 
     public static final int NAME_FIELD_NUMBER = 2;
-    private volatile java.lang.Object name_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object name_ = "";
     /**
      * required string name = 2;
      * @return Whether the name field is set.
      */
+    @java.lang.Override
     public boolean hasName() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -196,6 +142,7 @@ public boolean hasName() {
      * required string name = 2;
      * @return The name.
      */
+    @java.lang.Override
     public java.lang.String getName() {
       java.lang.Object ref = name_;
       if (ref instanceof java.lang.String) {
@@ -214,6 +161,7 @@ public java.lang.String getName() {
      * required string name = 2;
      * @return The bytes for name.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getNameBytes() {
       java.lang.Object ref = name_;
@@ -229,11 +177,12 @@ public java.lang.String getName() {
     }
 
     public static final int STATUS_FIELD_NUMBER = 3;
-    private boolean status_;
+    private boolean status_ = false;
     /**
      * required bool status = 3;
      * @return Whether the status field is set.
      */
+    @java.lang.Override
     public boolean hasStatus() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -241,6 +190,7 @@ public boolean hasStatus() {
      * required bool status = 3;
      * @return The status.
      */
+    @java.lang.Override
     public boolean getStatus() {
       return status_;
     }
@@ -280,7 +230,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeBool(3, status_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -300,7 +250,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(3, status_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -330,7 +280,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getStatus()
             != other.getStatus()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -355,7 +305,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getStatus());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -404,11 +354,13 @@ public static org.apache.pekko.remote.ProtobufProtocol.MyMessage parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.remote.ProtobufProtocol.MyMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.remote.ProtobufProtocol.MyMessage parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -472,28 +424,21 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.remote.ProtobufProtocol.MyMessage.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         id_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         name_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         status_ = false;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -520,6 +465,12 @@ public org.apache.pekko.remote.ProtobufProtocol.MyMessage build() {
       @java.lang.Override
       public org.apache.pekko.remote.ProtobufProtocol.MyMessage buildPartial() {
         org.apache.pekko.remote.ProtobufProtocol.MyMessage result = new org.apache.pekko.remote.ProtobufProtocol.MyMessage(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.remote.ProtobufProtocol.MyMessage result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -527,16 +478,14 @@ public org.apache.pekko.remote.ProtobufProtocol.MyMessage buildPartial() {
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.name_ = name_;
           to_bitField0_ |= 0x00000002;
         }
-        result.name_ = name_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.status_ = status_;
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -587,14 +536,14 @@ public Builder mergeFrom(org.apache.pekko.remote.ProtobufProtocol.MyMessage othe
           setId(other.getId());
         }
         if (other.hasName()) {
-          bitField0_ |= 0x00000002;
           name_ = other.name_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasStatus()) {
           setStatus(other.getStatus());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -618,17 +567,45 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.ProtobufProtocol.MyMessage parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                id_ = input.readUInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 18: {
+                name_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 24: {
+                status_ = input.readBool();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.remote.ProtobufProtocol.MyMessage) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -638,6 +615,7 @@ public Builder mergeFrom(
        * required uint64 id = 1;
        * @return Whether the id field is set.
        */
+      @java.lang.Override
       public boolean hasId() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -645,6 +623,7 @@ public boolean hasId() {
        * required uint64 id = 1;
        * @return The id.
        */
+      @java.lang.Override
       public long getId() {
         return id_;
       }
@@ -654,8 +633,9 @@ public long getId() {
        * @return This builder for chaining.
        */
       public Builder setId(long value) {
-        bitField0_ |= 0x00000001;
+
         id_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -720,11 +700,9 @@ public java.lang.String getName() {
        */
       public Builder setName(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         name_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -733,8 +711,8 @@ public Builder setName(
        * @return This builder for chaining.
        */
       public Builder clearName() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         name_ = getDefaultInstance().getName();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -745,11 +723,9 @@ public Builder clearName() {
        */
       public Builder setNameBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         name_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -759,6 +735,7 @@ public Builder setNameBytes(
        * required bool status = 3;
        * @return Whether the status field is set.
        */
+      @java.lang.Override
       public boolean hasStatus() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -766,6 +743,7 @@ public boolean hasStatus() {
        * required bool status = 3;
        * @return The status.
        */
+      @java.lang.Override
       public boolean getStatus() {
         return status_;
       }
@@ -775,8 +753,9 @@ public boolean getStatus() {
        * @return This builder for chaining.
        */
       public Builder setStatus(boolean value) {
-        bitField0_ |= 0x00000004;
+
         status_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -823,7 +802,18 @@ public MyMessage parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new MyMessage(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
diff --git a/remote/src/test/java/org/apache/pekko/remote/protobuf/v3/ProtobufProtocolV3.java b/remote/src/test/java/org/apache/pekko/remote/protobuf/v3/ProtobufProtocolV3.java
index 83e20898ba4..58835143cdc 100644
--- a/remote/src/test/java/org/apache/pekko/remote/protobuf/v3/ProtobufProtocolV3.java
+++ b/remote/src/test/java/org/apache/pekko/remote/protobuf/v3/ProtobufProtocolV3.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2021-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ProtobufProtocolV3.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.remote.protobuf.v3;
 
 public final class ProtobufProtocolV3 {
@@ -83,66 +84,6 @@ protected java.lang.Object newInstance(
       return new MyMessageV3();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
-      return this.unknownFields;
-    }
-
-    private MyMessageV3(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-
-                query_ = s;
-                break;
-              }
-            case 16:
-              {
-                pageNumber_ = input.readInt32();
-                break;
-              }
-            case 24:
-              {
-                resultPerPage_ = input.readInt32();
-                break;
-              }
-            default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
-            .setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.remote.protobuf.v3.ProtobufProtocolV3
@@ -160,12 +101,15 @@ private MyMessageV3(
     }
 
     public static final int QUERY_FIELD_NUMBER = 1;
-    private volatile java.lang.Object query_;
+
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object query_ = "";
     /**
      * string query = 1;
      *
      * @return The query.
      */
+    @java.lang.Override
     public java.lang.String getQuery() {
       java.lang.Object ref = query_;
       if (ref instanceof java.lang.String) {
@@ -183,6 +127,7 @@ public java.lang.String getQuery() {
      *
      * @return The bytes for query.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getQueryBytes() {
       java.lang.Object ref = query_;
       if (ref instanceof java.lang.String) {
@@ -196,23 +141,25 @@ public org.apache.pekko.protobufv3.internal.ByteString getQueryBytes() {
     }
 
     public static final int PAGE_NUMBER_FIELD_NUMBER = 2;
-    private int pageNumber_;
+    private int pageNumber_ = 0;
     /**
      * int32 page_number = 2;
      *
      * @return The pageNumber.
      */
+    @java.lang.Override
     public int getPageNumber() {
       return pageNumber_;
     }
 
     public static final int RESULT_PER_PAGE_FIELD_NUMBER = 3;
-    private int resultPerPage_;
+    private int resultPerPage_ = 0;
     /**
      * int32 result_per_page = 3;
      *
      * @return The resultPerPage.
      */
+    @java.lang.Override
     public int getResultPerPage() {
       return resultPerPage_;
     }
@@ -232,7 +179,7 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
         throws java.io.IOException {
-      if (!getQueryBytes().isEmpty()) {
+      if (!org.apache.pekko.protobufv3.internal.GeneratedMessageV3.isStringEmpty(query_)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, query_);
       }
       if (pageNumber_ != 0) {
@@ -241,7 +188,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (resultPerPage_ != 0) {
         output.writeInt32(3, resultPerPage_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -250,7 +197,7 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (!getQueryBytes().isEmpty()) {
+      if (!org.apache.pekko.protobufv3.internal.GeneratedMessageV3.isStringEmpty(query_)) {
         size +=
             org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, query_);
       }
@@ -263,7 +210,7 @@ public int getSerializedSize() {
             org.apache.pekko.protobufv3.internal.CodedOutputStream.computeInt32Size(
                 3, resultPerPage_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -282,7 +229,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getQuery().equals(other.getQuery())) return false;
       if (getPageNumber() != other.getPageNumber()) return false;
       if (getResultPerPage() != other.getResultPerPage()) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -299,7 +246,7 @@ public int hashCode() {
       hash = (53 * hash) + getPageNumber();
       hash = (37 * hash) + RESULT_PER_PAGE_FIELD_NUMBER;
       hash = (53 * hash) + getResultPerPage();
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -433,29 +380,20 @@ public static final class Builder
 
       // Construct using
       // org.apache.pekko.remote.protobuf.v3.ProtobufProtocolV3.MyMessageV3.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         query_ = "";
-
         pageNumber_ = 0;
-
         resultPerPage_ = 0;
-
         return this;
       }
 
@@ -485,13 +423,27 @@ public org.apache.pekko.remote.protobuf.v3.ProtobufProtocolV3.MyMessageV3 build(
       public org.apache.pekko.remote.protobuf.v3.ProtobufProtocolV3.MyMessageV3 buildPartial() {
         org.apache.pekko.remote.protobuf.v3.ProtobufProtocolV3.MyMessageV3 result =
             new org.apache.pekko.remote.protobuf.v3.ProtobufProtocolV3.MyMessageV3(this);
-        result.query_ = query_;
-        result.pageNumber_ = pageNumber_;
-        result.resultPerPage_ = resultPerPage_;
+        if (bitField0_ != 0) {
+          buildPartial0(result);
+        }
         onBuilt();
         return result;
       }
 
+      private void buildPartial0(
+          org.apache.pekko.remote.protobuf.v3.ProtobufProtocolV3.MyMessageV3 result) {
+        int from_bitField0_ = bitField0_;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.query_ = query_;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.pageNumber_ = pageNumber_;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.resultPerPage_ = resultPerPage_;
+        }
+      }
+
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -549,6 +501,7 @@ public Builder mergeFrom(
                 .getDefaultInstance()) return this;
         if (!other.getQuery().isEmpty()) {
           query_ = other.query_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.getPageNumber() != 0) {
@@ -557,7 +510,7 @@ public Builder mergeFrom(
         if (other.getResultPerPage() != 0) {
           setResultPerPage(other.getResultPerPage());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -572,22 +525,54 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.remote.protobuf.v3.ProtobufProtocolV3.MyMessageV3 parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  query_ = input.readStringRequireUtf8();
+                  bitField0_ |= 0x00000001;
+                  break;
+                } // case 10
+              case 16:
+                {
+                  pageNumber_ = input.readInt32();
+                  bitField0_ |= 0x00000002;
+                  break;
+                } // case 16
+              case 24:
+                {
+                  resultPerPage_ = input.readInt32();
+                  bitField0_ |= 0x00000004;
+                  break;
+                } // case 24
+              default:
+                {
+                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                    done = true; // was an endgroup tag
+                  }
+                  break;
+                } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (org.apache.pekko.remote.protobuf.v3.ProtobufProtocolV3.MyMessageV3)
-                  e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
 
+      private int bitField0_;
+
       private java.lang.Object query_ = "";
       /**
        * string query = 1;
@@ -632,8 +617,8 @@ public Builder setQuery(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
-
         query_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -643,8 +628,8 @@ public Builder setQuery(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearQuery() {
-
         query_ = getDefaultInstance().getQuery();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -659,8 +644,8 @@ public Builder setQueryBytes(org.apache.pekko.protobufv3.internal.ByteString val
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
-
         query_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -671,6 +656,7 @@ public Builder setQueryBytes(org.apache.pekko.protobufv3.internal.ByteString val
        *
        * @return The pageNumber.
        */
+      @java.lang.Override
       public int getPageNumber() {
         return pageNumber_;
       }
@@ -683,6 +669,7 @@ public int getPageNumber() {
       public Builder setPageNumber(int value) {
 
         pageNumber_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -692,7 +679,7 @@ public Builder setPageNumber(int value) {
        * @return This builder for chaining.
        */
       public Builder clearPageNumber() {
-
+        bitField0_ = (bitField0_ & ~0x00000002);
         pageNumber_ = 0;
         onChanged();
         return this;
@@ -704,6 +691,7 @@ public Builder clearPageNumber() {
        *
        * @return The resultPerPage.
        */
+      @java.lang.Override
       public int getResultPerPage() {
         return resultPerPage_;
       }
@@ -716,6 +704,7 @@ public int getResultPerPage() {
       public Builder setResultPerPage(int value) {
 
         resultPerPage_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -725,7 +714,7 @@ public Builder setResultPerPage(int value) {
        * @return This builder for chaining.
        */
       public Builder clearResultPerPage() {
-
+        bitField0_ = (bitField0_ & ~0x00000004);
         resultPerPage_ = 0;
         onChanged();
         return this;
@@ -766,7 +755,19 @@ public MyMessageV3 parsePartialFrom(
               org.apache.pekko.protobufv3.internal.CodedInputStream input,
               org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
               throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-            return new MyMessageV3(input, extensionRegistry);
+            Builder builder = newBuilder();
+            try {
+              builder.mergeFrom(input, extensionRegistry);
+            } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+              throw e.setUnfinishedMessage(builder.buildPartial());
+            } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+              throw e.asInvalidProtocolBufferException()
+                  .setUnfinishedMessage(builder.buildPartial());
+            } catch (java.io.IOException e) {
+              throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+                  .setUnfinishedMessage(builder.buildPartial());
+            }
+            return builder.buildPartial();
           }
         };
 
diff --git a/stream/src/main/java/org/apache/pekko/stream/StreamRefMessages.java b/stream/src/main/java/org/apache/pekko/stream/StreamRefMessages.java
index 9be3b7480e0..2ccb368046f 100644
--- a/stream/src/main/java/org/apache/pekko/stream/StreamRefMessages.java
+++ b/stream/src/main/java/org/apache/pekko/stream/StreamRefMessages.java
@@ -8,12 +8,13 @@
  */
 
 /*
- * Copyright (C) 2020-2022 Lightbend Inc. 
+ * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: StreamRefMessages.proto
 
+// Protobuf Java Version: 3.25.6
 package org.apache.pekko.stream;
 
 public final class StreamRefMessages {
@@ -49,7 +50,7 @@ public interface SinkRefOrBuilder extends
   /**
    * Protobuf type {@code SinkRef}
    */
-  public  static final class SinkRef extends
+  public static final class SinkRef extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:SinkRef)
       SinkRefOrBuilder {
@@ -68,62 +69,6 @@ protected java.lang.Object newInstance(
       return new SinkRef();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private SinkRef(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.stream.StreamRefMessages.ActorRef.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = targetRef_.toBuilder();
-              }
-              targetRef_ = input.readMessage(org.apache.pekko.stream.StreamRefMessages.ActorRef.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(targetRef_);
-                targetRef_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.stream.StreamRefMessages.internal_static_SinkRef_descriptor;
@@ -144,6 +89,7 @@ private SinkRef(
      * required .ActorRef targetRef = 1;
      * @return Whether the targetRef field is set.
      */
+    @java.lang.Override
     public boolean hasTargetRef() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -151,12 +97,14 @@ public boolean hasTargetRef() {
      * required .ActorRef targetRef = 1;
      * @return The targetRef.
      */
+    @java.lang.Override
     public org.apache.pekko.stream.StreamRefMessages.ActorRef getTargetRef() {
       return targetRef_ == null ? org.apache.pekko.stream.StreamRefMessages.ActorRef.getDefaultInstance() : targetRef_;
     }
     /**
      * required .ActorRef targetRef = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.stream.StreamRefMessages.ActorRefOrBuilder getTargetRefOrBuilder() {
       return targetRef_ == null ? org.apache.pekko.stream.StreamRefMessages.ActorRef.getDefaultInstance() : targetRef_;
     }
@@ -186,7 +134,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getTargetRef());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -199,7 +147,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getTargetRef());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -219,7 +167,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getTargetRef()
             .equals(other.getTargetRef())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -234,7 +182,7 @@ public int hashCode() {
         hash = (37 * hash) + TARGETREF_FIELD_NUMBER;
         hash = (53 * hash) + getTargetRef().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -283,11 +231,13 @@ public static org.apache.pekko.stream.StreamRefMessages.SinkRef parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.stream.StreamRefMessages.SinkRef parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.stream.StreamRefMessages.SinkRef parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -368,12 +318,12 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (targetRefBuilder_ == null) {
-          targetRef_ = null;
-        } else {
-          targetRefBuilder_.clear();
+        bitField0_ = 0;
+        targetRef_ = null;
+        if (targetRefBuilder_ != null) {
+          targetRefBuilder_.dispose();
+          targetRefBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -400,19 +350,21 @@ public org.apache.pekko.stream.StreamRefMessages.SinkRef build() {
       @java.lang.Override
       public org.apache.pekko.stream.StreamRefMessages.SinkRef buildPartial() {
         org.apache.pekko.stream.StreamRefMessages.SinkRef result = new org.apache.pekko.stream.StreamRefMessages.SinkRef(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.stream.StreamRefMessages.SinkRef result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (targetRefBuilder_ == null) {
-            result.targetRef_ = targetRef_;
-          } else {
-            result.targetRef_ = targetRefBuilder_.build();
-          }
+          result.targetRef_ = targetRefBuilder_ == null
+              ? targetRef_
+              : targetRefBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -462,7 +414,7 @@ public Builder mergeFrom(org.apache.pekko.stream.StreamRefMessages.SinkRef other
         if (other.hasTargetRef()) {
           mergeTargetRef(other.getTargetRef());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -483,17 +435,37 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.stream.StreamRefMessages.SinkRef parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getTargetRefFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.stream.StreamRefMessages.SinkRef) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -528,11 +500,11 @@ public Builder setTargetRef(org.apache.pekko.stream.StreamRefMessages.ActorRef v
             throw new NullPointerException();
           }
           targetRef_ = value;
-          onChanged();
         } else {
           targetRefBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -542,11 +514,11 @@ public Builder setTargetRef(
           org.apache.pekko.stream.StreamRefMessages.ActorRef.Builder builderForValue) {
         if (targetRefBuilder_ == null) {
           targetRef_ = builderForValue.build();
-          onChanged();
         } else {
           targetRefBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -555,31 +527,32 @@ public Builder setTargetRef(
       public Builder mergeTargetRef(org.apache.pekko.stream.StreamRefMessages.ActorRef value) {
         if (targetRefBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              targetRef_ != null &&
-              targetRef_ != org.apache.pekko.stream.StreamRefMessages.ActorRef.getDefaultInstance()) {
-            targetRef_ =
-              org.apache.pekko.stream.StreamRefMessages.ActorRef.newBuilder(targetRef_).mergeFrom(value).buildPartial();
+            targetRef_ != null &&
+            targetRef_ != org.apache.pekko.stream.StreamRefMessages.ActorRef.getDefaultInstance()) {
+            getTargetRefBuilder().mergeFrom(value);
           } else {
             targetRef_ = value;
           }
-          onChanged();
         } else {
           targetRefBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (targetRef_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .ActorRef targetRef = 1;
        */
       public Builder clearTargetRef() {
-        if (targetRefBuilder_ == null) {
-          targetRef_ = null;
-          onChanged();
-        } else {
-          targetRefBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        targetRef_ = null;
+        if (targetRefBuilder_ != null) {
+          targetRefBuilder_.dispose();
+          targetRefBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -650,7 +623,18 @@ public SinkRef parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new SinkRef(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -692,7 +676,7 @@ public interface SourceRefOrBuilder extends
   /**
    * Protobuf type {@code SourceRef}
    */
-  public  static final class SourceRef extends
+  public static final class SourceRef extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:SourceRef)
       SourceRefOrBuilder {
@@ -711,62 +695,6 @@ protected java.lang.Object newInstance(
       return new SourceRef();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private SourceRef(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.stream.StreamRefMessages.ActorRef.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = originRef_.toBuilder();
-              }
-              originRef_ = input.readMessage(org.apache.pekko.stream.StreamRefMessages.ActorRef.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(originRef_);
-                originRef_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.stream.StreamRefMessages.internal_static_SourceRef_descriptor;
@@ -787,6 +715,7 @@ private SourceRef(
      * required .ActorRef originRef = 1;
      * @return Whether the originRef field is set.
      */
+    @java.lang.Override
     public boolean hasOriginRef() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -794,12 +723,14 @@ public boolean hasOriginRef() {
      * required .ActorRef originRef = 1;
      * @return The originRef.
      */
+    @java.lang.Override
     public org.apache.pekko.stream.StreamRefMessages.ActorRef getOriginRef() {
       return originRef_ == null ? org.apache.pekko.stream.StreamRefMessages.ActorRef.getDefaultInstance() : originRef_;
     }
     /**
      * required .ActorRef originRef = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.stream.StreamRefMessages.ActorRefOrBuilder getOriginRefOrBuilder() {
       return originRef_ == null ? org.apache.pekko.stream.StreamRefMessages.ActorRef.getDefaultInstance() : originRef_;
     }
@@ -829,7 +760,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getOriginRef());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -842,7 +773,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getOriginRef());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -862,7 +793,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getOriginRef()
             .equals(other.getOriginRef())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -877,7 +808,7 @@ public int hashCode() {
         hash = (37 * hash) + ORIGINREF_FIELD_NUMBER;
         hash = (53 * hash) + getOriginRef().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -926,11 +857,13 @@ public static org.apache.pekko.stream.StreamRefMessages.SourceRef parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.stream.StreamRefMessages.SourceRef parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.stream.StreamRefMessages.SourceRef parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -1011,12 +944,12 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (originRefBuilder_ == null) {
-          originRef_ = null;
-        } else {
-          originRefBuilder_.clear();
+        bitField0_ = 0;
+        originRef_ = null;
+        if (originRefBuilder_ != null) {
+          originRefBuilder_.dispose();
+          originRefBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -1043,19 +976,21 @@ public org.apache.pekko.stream.StreamRefMessages.SourceRef build() {
       @java.lang.Override
       public org.apache.pekko.stream.StreamRefMessages.SourceRef buildPartial() {
         org.apache.pekko.stream.StreamRefMessages.SourceRef result = new org.apache.pekko.stream.StreamRefMessages.SourceRef(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.stream.StreamRefMessages.SourceRef result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (originRefBuilder_ == null) {
-            result.originRef_ = originRef_;
-          } else {
-            result.originRef_ = originRefBuilder_.build();
-          }
+          result.originRef_ = originRefBuilder_ == null
+              ? originRef_
+              : originRefBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1105,7 +1040,7 @@ public Builder mergeFrom(org.apache.pekko.stream.StreamRefMessages.SourceRef oth
         if (other.hasOriginRef()) {
           mergeOriginRef(other.getOriginRef());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1126,17 +1061,37 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.stream.StreamRefMessages.SourceRef parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getOriginRefFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.stream.StreamRefMessages.SourceRef) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -1171,11 +1126,11 @@ public Builder setOriginRef(org.apache.pekko.stream.StreamRefMessages.ActorRef v
             throw new NullPointerException();
           }
           originRef_ = value;
-          onChanged();
         } else {
           originRefBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1185,11 +1140,11 @@ public Builder setOriginRef(
           org.apache.pekko.stream.StreamRefMessages.ActorRef.Builder builderForValue) {
         if (originRefBuilder_ == null) {
           originRef_ = builderForValue.build();
-          onChanged();
         } else {
           originRefBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -1198,31 +1153,32 @@ public Builder setOriginRef(
       public Builder mergeOriginRef(org.apache.pekko.stream.StreamRefMessages.ActorRef value) {
         if (originRefBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              originRef_ != null &&
-              originRef_ != org.apache.pekko.stream.StreamRefMessages.ActorRef.getDefaultInstance()) {
-            originRef_ =
-              org.apache.pekko.stream.StreamRefMessages.ActorRef.newBuilder(originRef_).mergeFrom(value).buildPartial();
+            originRef_ != null &&
+            originRef_ != org.apache.pekko.stream.StreamRefMessages.ActorRef.getDefaultInstance()) {
+            getOriginRefBuilder().mergeFrom(value);
           } else {
             originRef_ = value;
           }
-          onChanged();
         } else {
           originRefBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (originRef_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .ActorRef originRef = 1;
        */
       public Builder clearOriginRef() {
-        if (originRefBuilder_ == null) {
-          originRef_ = null;
-          onChanged();
-        } else {
-          originRefBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        originRef_ = null;
+        if (originRefBuilder_ != null) {
+          originRefBuilder_.dispose();
+          originRefBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -1293,7 +1249,18 @@ public SourceRef parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new SourceRef(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -1337,7 +1304,7 @@ public interface ActorRefOrBuilder extends
   /**
    * Protobuf type {@code ActorRef}
    */
-  public  static final class ActorRef extends
+  public static final class ActorRef extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ActorRef)
       ActorRefOrBuilder {
@@ -1357,55 +1324,6 @@ protected java.lang.Object newInstance(
       return new ActorRef();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ActorRef(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              path_ = bs;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.stream.StreamRefMessages.internal_static_ActorRef_descriptor;
@@ -1421,11 +1339,13 @@ private ActorRef(
 
     private int bitField0_;
     public static final int PATH_FIELD_NUMBER = 1;
-    private volatile java.lang.Object path_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object path_ = "";
     /**
      * required string path = 1;
      * @return Whether the path field is set.
      */
+    @java.lang.Override
     public boolean hasPath() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -1433,6 +1353,7 @@ public boolean hasPath() {
      * required string path = 1;
      * @return The path.
      */
+    @java.lang.Override
     public java.lang.String getPath() {
       java.lang.Object ref = path_;
       if (ref instanceof java.lang.String) {
@@ -1451,6 +1372,7 @@ public java.lang.String getPath() {
      * required string path = 1;
      * @return The bytes for path.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString
         getPathBytes() {
       java.lang.Object ref = path_;
@@ -1486,7 +1408,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, path_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -1498,7 +1420,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000001) != 0)) {
         size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, path_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1518,7 +1440,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getPath()
             .equals(other.getPath())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1533,7 +1455,7 @@ public int hashCode() {
         hash = (37 * hash) + PATH_FIELD_NUMBER;
         hash = (53 * hash) + getPath().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1582,11 +1504,13 @@ public static org.apache.pekko.stream.StreamRefMessages.ActorRef parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.stream.StreamRefMessages.ActorRef parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.stream.StreamRefMessages.ActorRef parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -1650,24 +1574,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.stream.StreamRefMessages.ActorRef.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         path_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -1694,15 +1613,19 @@ public org.apache.pekko.stream.StreamRefMessages.ActorRef build() {
       @java.lang.Override
       public org.apache.pekko.stream.StreamRefMessages.ActorRef buildPartial() {
         org.apache.pekko.stream.StreamRefMessages.ActorRef result = new org.apache.pekko.stream.StreamRefMessages.ActorRef(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.stream.StreamRefMessages.ActorRef result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.path_ = path_;
           to_bitField0_ |= 0x00000001;
         }
-        result.path_ = path_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1750,11 +1673,11 @@ public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
       public Builder mergeFrom(org.apache.pekko.stream.StreamRefMessages.ActorRef other) {
         if (other == org.apache.pekko.stream.StreamRefMessages.ActorRef.getDefaultInstance()) return this;
         if (other.hasPath()) {
-          bitField0_ |= 0x00000001;
           path_ = other.path_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1772,17 +1695,35 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.stream.StreamRefMessages.ActorRef parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                path_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.stream.StreamRefMessages.ActorRef) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -1837,11 +1778,9 @@ public java.lang.String getPath() {
        */
       public Builder setPath(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         path_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1850,8 +1789,8 @@ public Builder setPath(
        * @return This builder for chaining.
        */
       public Builder clearPath() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         path_ = getDefaultInstance().getPath();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1862,11 +1801,9 @@ public Builder clearPath() {
        */
       public Builder setPathBytes(
           org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         path_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1903,7 +1840,18 @@ public ActorRef parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new ActorRef(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -1963,7 +1911,7 @@ public interface PayloadOrBuilder extends
   /**
    * Protobuf type {@code Payload}
    */
-  public  static final class Payload extends
+  public static final class Payload extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Payload)
       PayloadOrBuilder {
@@ -1984,64 +1932,6 @@ protected java.lang.Object newInstance(
       return new Payload();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Payload(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              bitField0_ |= 0x00000001;
-              enclosedMessage_ = input.readBytes();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              serializerId_ = input.readInt32();
-              break;
-            }
-            case 26: {
-              bitField0_ |= 0x00000004;
-              messageManifest_ = input.readBytes();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.stream.StreamRefMessages.internal_static_Payload_descriptor;
@@ -2057,11 +1947,12 @@ private Payload(
 
     private int bitField0_;
     public static final int ENCLOSEDMESSAGE_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.ByteString enclosedMessage_;
+    private org.apache.pekko.protobufv3.internal.ByteString enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * required bytes enclosedMessage = 1;
      * @return Whether the enclosedMessage field is set.
      */
+    @java.lang.Override
     public boolean hasEnclosedMessage() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -2069,16 +1960,18 @@ public boolean hasEnclosedMessage() {
      * required bytes enclosedMessage = 1;
      * @return The enclosedMessage.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
       return enclosedMessage_;
     }
 
     public static final int SERIALIZERID_FIELD_NUMBER = 2;
-    private int serializerId_;
+    private int serializerId_ = 0;
     /**
      * required int32 serializerId = 2;
      * @return Whether the serializerId field is set.
      */
+    @java.lang.Override
     public boolean hasSerializerId() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -2086,16 +1979,18 @@ public boolean hasSerializerId() {
      * required int32 serializerId = 2;
      * @return The serializerId.
      */
+    @java.lang.Override
     public int getSerializerId() {
       return serializerId_;
     }
 
     public static final int MESSAGEMANIFEST_FIELD_NUMBER = 3;
-    private org.apache.pekko.protobufv3.internal.ByteString messageManifest_;
+    private org.apache.pekko.protobufv3.internal.ByteString messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * optional bytes messageManifest = 3;
      * @return Whether the messageManifest field is set.
      */
+    @java.lang.Override
     public boolean hasMessageManifest() {
       return ((bitField0_ & 0x00000004) != 0);
     }
@@ -2103,6 +1998,7 @@ public boolean hasMessageManifest() {
      * optional bytes messageManifest = 3;
      * @return The messageManifest.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
       return messageManifest_;
     }
@@ -2138,7 +2034,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeBytes(3, messageManifest_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -2159,7 +2055,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(3, messageManifest_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2189,7 +2085,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getMessageManifest()
             .equals(other.getMessageManifest())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -2212,7 +2108,7 @@ public int hashCode() {
         hash = (37 * hash) + MESSAGEMANIFEST_FIELD_NUMBER;
         hash = (53 * hash) + getMessageManifest().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -2261,11 +2157,13 @@ public static org.apache.pekko.stream.StreamRefMessages.Payload parseFrom(
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.stream.StreamRefMessages.Payload parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.stream.StreamRefMessages.Payload parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -2329,28 +2227,21 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.stream.StreamRefMessages.Payload.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
         serializerId_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -2377,23 +2268,27 @@ public org.apache.pekko.stream.StreamRefMessages.Payload build() {
       @java.lang.Override
       public org.apache.pekko.stream.StreamRefMessages.Payload buildPartial() {
         org.apache.pekko.stream.StreamRefMessages.Payload result = new org.apache.pekko.stream.StreamRefMessages.Payload(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.stream.StreamRefMessages.Payload result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.enclosedMessage_ = enclosedMessage_;
           to_bitField0_ |= 0x00000001;
         }
-        result.enclosedMessage_ = enclosedMessage_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.serializerId_ = serializerId_;
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.messageManifest_ = messageManifest_;
           to_bitField0_ |= 0x00000004;
         }
-        result.messageManifest_ = messageManifest_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -2449,7 +2344,7 @@ public Builder mergeFrom(org.apache.pekko.stream.StreamRefMessages.Payload other
         if (other.hasMessageManifest()) {
           setMessageManifest(other.getMessageManifest());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -2470,17 +2365,45 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.stream.StreamRefMessages.Payload parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                enclosedMessage_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                serializerId_ = input.readInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 26: {
+                messageManifest_ = input.readBytes();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.stream.StreamRefMessages.Payload) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -2490,6 +2413,7 @@ public Builder mergeFrom(
        * required bytes enclosedMessage = 1;
        * @return Whether the enclosedMessage field is set.
        */
+      @java.lang.Override
       public boolean hasEnclosedMessage() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -2497,6 +2421,7 @@ public boolean hasEnclosedMessage() {
        * required bytes enclosedMessage = 1;
        * @return The enclosedMessage.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
         return enclosedMessage_;
       }
@@ -2506,11 +2431,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
        * @return This builder for chaining.
        */
       public Builder setEnclosedMessage(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         enclosedMessage_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2530,6 +2453,7 @@ public Builder clearEnclosedMessage() {
        * required int32 serializerId = 2;
        * @return Whether the serializerId field is set.
        */
+      @java.lang.Override
       public boolean hasSerializerId() {
         return ((bitField0_ & 0x00000002) != 0);
       }
@@ -2537,6 +2461,7 @@ public boolean hasSerializerId() {
        * required int32 serializerId = 2;
        * @return The serializerId.
        */
+      @java.lang.Override
       public int getSerializerId() {
         return serializerId_;
       }
@@ -2546,8 +2471,9 @@ public int getSerializerId() {
        * @return This builder for chaining.
        */
       public Builder setSerializerId(int value) {
-        bitField0_ |= 0x00000002;
+
         serializerId_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2567,6 +2493,7 @@ public Builder clearSerializerId() {
        * optional bytes messageManifest = 3;
        * @return Whether the messageManifest field is set.
        */
+      @java.lang.Override
       public boolean hasMessageManifest() {
         return ((bitField0_ & 0x00000004) != 0);
       }
@@ -2574,6 +2501,7 @@ public boolean hasMessageManifest() {
        * optional bytes messageManifest = 3;
        * @return The messageManifest.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
         return messageManifest_;
       }
@@ -2583,11 +2511,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
        * @return This builder for chaining.
        */
       public Builder setMessageManifest(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+        if (value == null) { throw new NullPointerException(); }
         messageManifest_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -2634,7 +2560,18 @@ public Payload parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new Payload(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -2676,7 +2613,7 @@ public interface OnSubscribeHandshakeOrBuilder extends
   /**
    * Protobuf type {@code OnSubscribeHandshake}
    */
-  public  static final class OnSubscribeHandshake extends
+  public static final class OnSubscribeHandshake extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:OnSubscribeHandshake)
       OnSubscribeHandshakeOrBuilder {
@@ -2695,62 +2632,6 @@ protected java.lang.Object newInstance(
       return new OnSubscribeHandshake();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private OnSubscribeHandshake(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              org.apache.pekko.stream.StreamRefMessages.ActorRef.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = targetRef_.toBuilder();
-              }
-              targetRef_ = input.readMessage(org.apache.pekko.stream.StreamRefMessages.ActorRef.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(targetRef_);
-                targetRef_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.stream.StreamRefMessages.internal_static_OnSubscribeHandshake_descriptor;
@@ -2771,6 +2652,7 @@ private OnSubscribeHandshake(
      * required .ActorRef targetRef = 1;
      * @return Whether the targetRef field is set.
      */
+    @java.lang.Override
     public boolean hasTargetRef() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -2778,12 +2660,14 @@ public boolean hasTargetRef() {
      * required .ActorRef targetRef = 1;
      * @return The targetRef.
      */
+    @java.lang.Override
     public org.apache.pekko.stream.StreamRefMessages.ActorRef getTargetRef() {
       return targetRef_ == null ? org.apache.pekko.stream.StreamRefMessages.ActorRef.getDefaultInstance() : targetRef_;
     }
     /**
      * required .ActorRef targetRef = 1;
      */
+    @java.lang.Override
     public org.apache.pekko.stream.StreamRefMessages.ActorRefOrBuilder getTargetRefOrBuilder() {
       return targetRef_ == null ? org.apache.pekko.stream.StreamRefMessages.ActorRef.getDefaultInstance() : targetRef_;
     }
@@ -2813,7 +2697,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getTargetRef());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -2826,7 +2710,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getTargetRef());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2846,7 +2730,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getTargetRef()
             .equals(other.getTargetRef())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -2861,7 +2745,7 @@ public int hashCode() {
         hash = (37 * hash) + TARGETREF_FIELD_NUMBER;
         hash = (53 * hash) + getTargetRef().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -2910,11 +2794,13 @@ public static org.apache.pekko.stream.StreamRefMessages.OnSubscribeHandshake par
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.stream.StreamRefMessages.OnSubscribeHandshake parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.stream.StreamRefMessages.OnSubscribeHandshake parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -2995,12 +2881,12 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (targetRefBuilder_ == null) {
-          targetRef_ = null;
-        } else {
-          targetRefBuilder_.clear();
+        bitField0_ = 0;
+        targetRef_ = null;
+        if (targetRefBuilder_ != null) {
+          targetRefBuilder_.dispose();
+          targetRefBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -3027,19 +2913,21 @@ public org.apache.pekko.stream.StreamRefMessages.OnSubscribeHandshake build() {
       @java.lang.Override
       public org.apache.pekko.stream.StreamRefMessages.OnSubscribeHandshake buildPartial() {
         org.apache.pekko.stream.StreamRefMessages.OnSubscribeHandshake result = new org.apache.pekko.stream.StreamRefMessages.OnSubscribeHandshake(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.stream.StreamRefMessages.OnSubscribeHandshake result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (targetRefBuilder_ == null) {
-            result.targetRef_ = targetRef_;
-          } else {
-            result.targetRef_ = targetRefBuilder_.build();
-          }
+          result.targetRef_ = targetRefBuilder_ == null
+              ? targetRef_
+              : targetRefBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -3089,7 +2977,7 @@ public Builder mergeFrom(org.apache.pekko.stream.StreamRefMessages.OnSubscribeHa
         if (other.hasTargetRef()) {
           mergeTargetRef(other.getTargetRef());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -3110,17 +2998,37 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.stream.StreamRefMessages.OnSubscribeHandshake parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                input.readMessage(
+                    getTargetRefFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.stream.StreamRefMessages.OnSubscribeHandshake) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -3155,11 +3063,11 @@ public Builder setTargetRef(org.apache.pekko.stream.StreamRefMessages.ActorRef v
             throw new NullPointerException();
           }
           targetRef_ = value;
-          onChanged();
         } else {
           targetRefBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -3169,11 +3077,11 @@ public Builder setTargetRef(
           org.apache.pekko.stream.StreamRefMessages.ActorRef.Builder builderForValue) {
         if (targetRefBuilder_ == null) {
           targetRef_ = builderForValue.build();
-          onChanged();
         } else {
           targetRefBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -3182,31 +3090,32 @@ public Builder setTargetRef(
       public Builder mergeTargetRef(org.apache.pekko.stream.StreamRefMessages.ActorRef value) {
         if (targetRefBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              targetRef_ != null &&
-              targetRef_ != org.apache.pekko.stream.StreamRefMessages.ActorRef.getDefaultInstance()) {
-            targetRef_ =
-              org.apache.pekko.stream.StreamRefMessages.ActorRef.newBuilder(targetRef_).mergeFrom(value).buildPartial();
+            targetRef_ != null &&
+            targetRef_ != org.apache.pekko.stream.StreamRefMessages.ActorRef.getDefaultInstance()) {
+            getTargetRefBuilder().mergeFrom(value);
           } else {
             targetRef_ = value;
           }
-          onChanged();
         } else {
           targetRefBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (targetRef_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .ActorRef targetRef = 1;
        */
       public Builder clearTargetRef() {
-        if (targetRefBuilder_ == null) {
-          targetRef_ = null;
-          onChanged();
-        } else {
-          targetRefBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        targetRef_ = null;
+        if (targetRefBuilder_ != null) {
+          targetRefBuilder_.dispose();
+          targetRefBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -3277,7 +3186,18 @@ public OnSubscribeHandshake parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new OnSubscribeHandshake(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -3315,7 +3235,7 @@ public interface CumulativeDemandOrBuilder extends
   /**
    * Protobuf type {@code CumulativeDemand}
    */
-  public  static final class CumulativeDemand extends
+  public static final class CumulativeDemand extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:CumulativeDemand)
       CumulativeDemandOrBuilder {
@@ -3334,54 +3254,6 @@ protected java.lang.Object newInstance(
       return new CumulativeDemand();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private CumulativeDemand(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              seqNr_ = input.readInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.stream.StreamRefMessages.internal_static_CumulativeDemand_descriptor;
@@ -3397,11 +3269,12 @@ private CumulativeDemand(
 
     private int bitField0_;
     public static final int SEQNR_FIELD_NUMBER = 1;
-    private long seqNr_;
+    private long seqNr_ = 0L;
     /**
      * required int64 seqNr = 1;
      * @return Whether the seqNr field is set.
      */
+    @java.lang.Override
     public boolean hasSeqNr() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -3409,6 +3282,7 @@ public boolean hasSeqNr() {
      * required int64 seqNr = 1;
      * @return The seqNr.
      */
+    @java.lang.Override
     public long getSeqNr() {
       return seqNr_;
     }
@@ -3434,7 +3308,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeInt64(1, seqNr_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -3447,7 +3321,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(1, seqNr_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -3467,7 +3341,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getSeqNr()
             != other.getSeqNr()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -3483,7 +3357,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getSeqNr());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3532,11 +3406,13 @@ public static org.apache.pekko.stream.StreamRefMessages.CumulativeDemand parseFr
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.stream.StreamRefMessages.CumulativeDemand parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.stream.StreamRefMessages.CumulativeDemand parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -3600,24 +3476,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.stream.StreamRefMessages.CumulativeDemand.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         seqNr_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -3644,15 +3515,19 @@ public org.apache.pekko.stream.StreamRefMessages.CumulativeDemand build() {
       @java.lang.Override
       public org.apache.pekko.stream.StreamRefMessages.CumulativeDemand buildPartial() {
         org.apache.pekko.stream.StreamRefMessages.CumulativeDemand result = new org.apache.pekko.stream.StreamRefMessages.CumulativeDemand(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.stream.StreamRefMessages.CumulativeDemand result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.seqNr_ = seqNr_;
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -3702,7 +3577,7 @@ public Builder mergeFrom(org.apache.pekko.stream.StreamRefMessages.CumulativeDem
         if (other.hasSeqNr()) {
           setSeqNr(other.getSeqNr());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -3720,17 +3595,35 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.stream.StreamRefMessages.CumulativeDemand parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                seqNr_ = input.readInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.stream.StreamRefMessages.CumulativeDemand) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -3740,6 +3633,7 @@ public Builder mergeFrom(
        * required int64 seqNr = 1;
        * @return Whether the seqNr field is set.
        */
+      @java.lang.Override
       public boolean hasSeqNr() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -3747,6 +3641,7 @@ public boolean hasSeqNr() {
        * required int64 seqNr = 1;
        * @return The seqNr.
        */
+      @java.lang.Override
       public long getSeqNr() {
         return seqNr_;
       }
@@ -3756,8 +3651,9 @@ public long getSeqNr() {
        * @return This builder for chaining.
        */
       public Builder setSeqNr(long value) {
-        bitField0_ |= 0x00000001;
+
         seqNr_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -3804,7 +3700,18 @@ public CumulativeDemand parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new CumulativeDemand(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -3857,7 +3764,7 @@ public interface SequencedOnNextOrBuilder extends
   /**
    * Protobuf type {@code SequencedOnNext}
    */
-  public  static final class SequencedOnNext extends
+  public static final class SequencedOnNext extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:SequencedOnNext)
       SequencedOnNextOrBuilder {
@@ -3876,67 +3783,6 @@ protected java.lang.Object newInstance(
       return new SequencedOnNext();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private SequencedOnNext(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              seqNr_ = input.readInt64();
-              break;
-            }
-            case 18: {
-              org.apache.pekko.stream.StreamRefMessages.Payload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = payload_.toBuilder();
-              }
-              payload_ = input.readMessage(org.apache.pekko.stream.StreamRefMessages.Payload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(payload_);
-                payload_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.stream.StreamRefMessages.internal_static_SequencedOnNext_descriptor;
@@ -3952,11 +3798,12 @@ private SequencedOnNext(
 
     private int bitField0_;
     public static final int SEQNR_FIELD_NUMBER = 1;
-    private long seqNr_;
+    private long seqNr_ = 0L;
     /**
      * required int64 seqNr = 1;
      * @return Whether the seqNr field is set.
      */
+    @java.lang.Override
     public boolean hasSeqNr() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -3964,6 +3811,7 @@ public boolean hasSeqNr() {
      * required int64 seqNr = 1;
      * @return The seqNr.
      */
+    @java.lang.Override
     public long getSeqNr() {
       return seqNr_;
     }
@@ -3974,6 +3822,7 @@ public long getSeqNr() {
      * required .Payload payload = 2;
      * @return Whether the payload field is set.
      */
+    @java.lang.Override
     public boolean hasPayload() {
       return ((bitField0_ & 0x00000002) != 0);
     }
@@ -3981,12 +3830,14 @@ public boolean hasPayload() {
      * required .Payload payload = 2;
      * @return The payload.
      */
+    @java.lang.Override
     public org.apache.pekko.stream.StreamRefMessages.Payload getPayload() {
       return payload_ == null ? org.apache.pekko.stream.StreamRefMessages.Payload.getDefaultInstance() : payload_;
     }
     /**
      * required .Payload payload = 2;
      */
+    @java.lang.Override
     public org.apache.pekko.stream.StreamRefMessages.PayloadOrBuilder getPayloadOrBuilder() {
       return payload_ == null ? org.apache.pekko.stream.StreamRefMessages.Payload.getDefaultInstance() : payload_;
     }
@@ -4023,7 +3874,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getPayload());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -4040,7 +3891,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getPayload());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4065,7 +3916,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getPayload()
             .equals(other.getPayload())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -4085,7 +3936,7 @@ public int hashCode() {
         hash = (37 * hash) + PAYLOAD_FIELD_NUMBER;
         hash = (53 * hash) + getPayload().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4134,11 +3985,13 @@ public static org.apache.pekko.stream.StreamRefMessages.SequencedOnNext parseFro
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.stream.StreamRefMessages.SequencedOnNext parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.stream.StreamRefMessages.SequencedOnNext parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -4219,14 +4072,13 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         seqNr_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (payloadBuilder_ == null) {
-          payload_ = null;
-        } else {
-          payloadBuilder_.clear();
+        payload_ = null;
+        if (payloadBuilder_ != null) {
+          payloadBuilder_.dispose();
+          payloadBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -4253,6 +4105,12 @@ public org.apache.pekko.stream.StreamRefMessages.SequencedOnNext build() {
       @java.lang.Override
       public org.apache.pekko.stream.StreamRefMessages.SequencedOnNext buildPartial() {
         org.apache.pekko.stream.StreamRefMessages.SequencedOnNext result = new org.apache.pekko.stream.StreamRefMessages.SequencedOnNext(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.stream.StreamRefMessages.SequencedOnNext result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -4260,16 +4118,12 @@ public org.apache.pekko.stream.StreamRefMessages.SequencedOnNext buildPartial()
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (payloadBuilder_ == null) {
-            result.payload_ = payload_;
-          } else {
-            result.payload_ = payloadBuilder_.build();
-          }
+          result.payload_ = payloadBuilder_ == null
+              ? payload_
+              : payloadBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -4322,7 +4176,7 @@ public Builder mergeFrom(org.apache.pekko.stream.StreamRefMessages.SequencedOnNe
         if (other.hasPayload()) {
           mergePayload(other.getPayload());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -4346,17 +4200,42 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.stream.StreamRefMessages.SequencedOnNext parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                seqNr_ = input.readInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 18: {
+                input.readMessage(
+                    getPayloadFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.stream.StreamRefMessages.SequencedOnNext) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -4366,6 +4245,7 @@ public Builder mergeFrom(
        * required int64 seqNr = 1;
        * @return Whether the seqNr field is set.
        */
+      @java.lang.Override
       public boolean hasSeqNr() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -4373,6 +4253,7 @@ public boolean hasSeqNr() {
        * required int64 seqNr = 1;
        * @return The seqNr.
        */
+      @java.lang.Override
       public long getSeqNr() {
         return seqNr_;
       }
@@ -4382,8 +4263,9 @@ public long getSeqNr() {
        * @return This builder for chaining.
        */
       public Builder setSeqNr(long value) {
-        bitField0_ |= 0x00000001;
+
         seqNr_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4428,11 +4310,11 @@ public Builder setPayload(org.apache.pekko.stream.StreamRefMessages.Payload valu
             throw new NullPointerException();
           }
           payload_ = value;
-          onChanged();
         } else {
           payloadBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -4442,11 +4324,11 @@ public Builder setPayload(
           org.apache.pekko.stream.StreamRefMessages.Payload.Builder builderForValue) {
         if (payloadBuilder_ == null) {
           payload_ = builderForValue.build();
-          onChanged();
         } else {
           payloadBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -4455,31 +4337,32 @@ public Builder setPayload(
       public Builder mergePayload(org.apache.pekko.stream.StreamRefMessages.Payload value) {
         if (payloadBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              payload_ != null &&
-              payload_ != org.apache.pekko.stream.StreamRefMessages.Payload.getDefaultInstance()) {
-            payload_ =
-              org.apache.pekko.stream.StreamRefMessages.Payload.newBuilder(payload_).mergeFrom(value).buildPartial();
+            payload_ != null &&
+            payload_ != org.apache.pekko.stream.StreamRefMessages.Payload.getDefaultInstance()) {
+            getPayloadBuilder().mergeFrom(value);
           } else {
             payload_ = value;
           }
-          onChanged();
         } else {
           payloadBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (payload_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .Payload payload = 2;
        */
       public Builder clearPayload() {
-        if (payloadBuilder_ == null) {
-          payload_ = null;
-          onChanged();
-        } else {
-          payloadBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        payload_ = null;
+        if (payloadBuilder_ != null) {
+          payloadBuilder_.dispose();
+          payloadBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -4550,7 +4433,18 @@ public SequencedOnNext parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new SequencedOnNext(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -4588,7 +4482,7 @@ public interface RemoteStreamFailureOrBuilder extends
   /**
    * Protobuf type {@code RemoteStreamFailure}
    */
-  public  static final class RemoteStreamFailure extends
+  public static final class RemoteStreamFailure extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:RemoteStreamFailure)
       RemoteStreamFailureOrBuilder {
@@ -4608,54 +4502,6 @@ protected java.lang.Object newInstance(
       return new RemoteStreamFailure();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private RemoteStreamFailure(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              bitField0_ |= 0x00000001;
-              cause_ = input.readBytes();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.stream.StreamRefMessages.internal_static_RemoteStreamFailure_descriptor;
@@ -4671,11 +4517,12 @@ private RemoteStreamFailure(
 
     private int bitField0_;
     public static final int CAUSE_FIELD_NUMBER = 1;
-    private org.apache.pekko.protobufv3.internal.ByteString cause_;
+    private org.apache.pekko.protobufv3.internal.ByteString cause_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     /**
      * optional bytes cause = 1;
      * @return Whether the cause field is set.
      */
+    @java.lang.Override
     public boolean hasCause() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -4683,6 +4530,7 @@ public boolean hasCause() {
      * optional bytes cause = 1;
      * @return The cause.
      */
+    @java.lang.Override
     public org.apache.pekko.protobufv3.internal.ByteString getCause() {
       return cause_;
     }
@@ -4704,7 +4552,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeBytes(1, cause_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -4717,7 +4565,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(1, cause_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4737,7 +4585,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getCause()
             .equals(other.getCause())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -4752,7 +4600,7 @@ public int hashCode() {
         hash = (37 * hash) + CAUSE_FIELD_NUMBER;
         hash = (53 * hash) + getCause().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4801,11 +4649,13 @@ public static org.apache.pekko.stream.StreamRefMessages.RemoteStreamFailure pars
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.stream.StreamRefMessages.RemoteStreamFailure parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.stream.StreamRefMessages.RemoteStreamFailure parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -4869,24 +4719,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.stream.StreamRefMessages.RemoteStreamFailure.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         cause_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -4913,15 +4758,19 @@ public org.apache.pekko.stream.StreamRefMessages.RemoteStreamFailure build() {
       @java.lang.Override
       public org.apache.pekko.stream.StreamRefMessages.RemoteStreamFailure buildPartial() {
         org.apache.pekko.stream.StreamRefMessages.RemoteStreamFailure result = new org.apache.pekko.stream.StreamRefMessages.RemoteStreamFailure(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.stream.StreamRefMessages.RemoteStreamFailure result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.cause_ = cause_;
           to_bitField0_ |= 0x00000001;
         }
-        result.cause_ = cause_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -4971,7 +4820,7 @@ public Builder mergeFrom(org.apache.pekko.stream.StreamRefMessages.RemoteStreamF
         if (other.hasCause()) {
           setCause(other.getCause());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -4986,17 +4835,35 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.stream.StreamRefMessages.RemoteStreamFailure parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                cause_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.stream.StreamRefMessages.RemoteStreamFailure) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -5006,6 +4873,7 @@ public Builder mergeFrom(
        * optional bytes cause = 1;
        * @return Whether the cause field is set.
        */
+      @java.lang.Override
       public boolean hasCause() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -5013,6 +4881,7 @@ public boolean hasCause() {
        * optional bytes cause = 1;
        * @return The cause.
        */
+      @java.lang.Override
       public org.apache.pekko.protobufv3.internal.ByteString getCause() {
         return cause_;
       }
@@ -5022,11 +4891,9 @@ public org.apache.pekko.protobufv3.internal.ByteString getCause() {
        * @return This builder for chaining.
        */
       public Builder setCause(org.apache.pekko.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         cause_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -5073,7 +4940,18 @@ public RemoteStreamFailure parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new RemoteStreamFailure(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };
 
@@ -5111,7 +4989,7 @@ public interface RemoteStreamCompletedOrBuilder extends
   /**
    * Protobuf type {@code RemoteStreamCompleted}
    */
-  public  static final class RemoteStreamCompleted extends
+  public static final class RemoteStreamCompleted extends
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:RemoteStreamCompleted)
       RemoteStreamCompletedOrBuilder {
@@ -5130,54 +5008,6 @@ protected java.lang.Object newInstance(
       return new RemoteStreamCompleted();
     }
 
-    @java.lang.Override
-    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private RemoteStreamCompleted(
-        org.apache.pekko.protobufv3.internal.CodedInputStream input,
-        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              seqNr_ = input.readInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.stream.StreamRefMessages.internal_static_RemoteStreamCompleted_descriptor;
@@ -5193,11 +5023,12 @@ private RemoteStreamCompleted(
 
     private int bitField0_;
     public static final int SEQNR_FIELD_NUMBER = 1;
-    private long seqNr_;
+    private long seqNr_ = 0L;
     /**
      * required int64 seqNr = 1;
      * @return Whether the seqNr field is set.
      */
+    @java.lang.Override
     public boolean hasSeqNr() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -5205,6 +5036,7 @@ public boolean hasSeqNr() {
      * required int64 seqNr = 1;
      * @return The seqNr.
      */
+    @java.lang.Override
     public long getSeqNr() {
       return seqNr_;
     }
@@ -5230,7 +5062,7 @@ public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream outpu
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeInt64(1, seqNr_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -5243,7 +5075,7 @@ public int getSerializedSize() {
         size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(1, seqNr_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5263,7 +5095,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getSeqNr()
             != other.getSeqNr()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -5279,7 +5111,7 @@ public int hashCode() {
         hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getSeqNr());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -5328,11 +5160,13 @@ public static org.apache.pekko.stream.StreamRefMessages.RemoteStreamCompleted pa
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.apache.pekko.stream.StreamRefMessages.RemoteStreamCompleted parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.apache.pekko.stream.StreamRefMessages.RemoteStreamCompleted parseDelimitedFrom(
         java.io.InputStream input,
         org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
@@ -5396,24 +5230,19 @@ public static final class Builder extends
 
       // Construct using org.apache.pekko.stream.StreamRefMessages.RemoteStreamCompleted.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         seqNr_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -5440,15 +5269,19 @@ public org.apache.pekko.stream.StreamRefMessages.RemoteStreamCompleted build() {
       @java.lang.Override
       public org.apache.pekko.stream.StreamRefMessages.RemoteStreamCompleted buildPartial() {
         org.apache.pekko.stream.StreamRefMessages.RemoteStreamCompleted result = new org.apache.pekko.stream.StreamRefMessages.RemoteStreamCompleted(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.apache.pekko.stream.StreamRefMessages.RemoteStreamCompleted result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.seqNr_ = seqNr_;
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -5498,7 +5331,7 @@ public Builder mergeFrom(org.apache.pekko.stream.StreamRefMessages.RemoteStreamC
         if (other.hasSeqNr()) {
           setSeqNr(other.getSeqNr());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -5516,17 +5349,35 @@ public Builder mergeFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.pekko.stream.StreamRefMessages.RemoteStreamCompleted parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8: {
+                seqNr_ = input.readInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.pekko.stream.StreamRefMessages.RemoteStreamCompleted) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -5536,6 +5387,7 @@ public Builder mergeFrom(
        * required int64 seqNr = 1;
        * @return Whether the seqNr field is set.
        */
+      @java.lang.Override
       public boolean hasSeqNr() {
         return ((bitField0_ & 0x00000001) != 0);
       }
@@ -5543,6 +5395,7 @@ public boolean hasSeqNr() {
        * required int64 seqNr = 1;
        * @return The seqNr.
        */
+      @java.lang.Override
       public long getSeqNr() {
         return seqNr_;
       }
@@ -5552,8 +5405,9 @@ public long getSeqNr() {
        * @return This builder for chaining.
        */
       public Builder setSeqNr(long value) {
-        bitField0_ |= 0x00000001;
+
         seqNr_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -5600,7 +5454,18 @@ public RemoteStreamCompleted parsePartialFrom(
           org.apache.pekko.protobufv3.internal.CodedInputStream input,
           org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
-        return new RemoteStreamCompleted(input, extensionRegistry);
+        Builder builder = newBuilder();
+        try {
+          builder.mergeFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(builder.buildPartial());
+        } catch (org.apache.pekko.protobufv3.internal.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(builder.buildPartial());
+        }
+        return builder.buildPartial();
       }
     };