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 11d6d29959..95a3f9e82f 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
@@ -1098,7 +1098,7 @@ public final class ClusterMetricsMessages {
     }
     private MetricsGossip() {
       allAddresses_ = java.util.Collections.emptyList();
-      allMetricNames_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      allMetricNames_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       nodeMetrics_ = java.util.Collections.emptyList();
     }
 
@@ -1556,7 +1556,7 @@ public final class ClusterMetricsMessages {
         } else {
           allAddressesBuilder_.clear();
         }
-        allMetricNames_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        allMetricNames_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         if (nodeMetricsBuilder_ == null) {
           nodeMetrics_ = java.util.Collections.emptyList();
@@ -2004,7 +2004,7 @@ public final class ClusterMetricsMessages {
         return allAddressesBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList allMetricNames_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList allMetricNames_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureAllMetricNamesIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
           allMetricNames_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(allMetricNames_);
@@ -2092,7 +2092,7 @@ public final class ClusterMetricsMessages {
        * @return This builder for chaining.
        */
       public Builder clearAllMetricNames() {
-        allMetricNames_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        allMetricNames_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
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 a4c136d054..1e8c40abb9 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
@@ -144,9 +144,9 @@ public final class ClusterShardingMessages {
     }
     private CoordinatorState() {
       shards_ = java.util.Collections.emptyList();
-      regions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
-      regionProxies_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
-      unallocatedShards_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      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
@@ -1455,11 +1455,11 @@ public final class ClusterShardingMessages {
         } else {
           shardsBuilder_.clear();
         }
-        regions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        regions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
-        regionProxies_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        regionProxies_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000004);
-        unallocatedShards_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        unallocatedShards_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
@@ -1891,7 +1891,7 @@ public final class ClusterShardingMessages {
         return shardsBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList regions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList regions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureRegionsIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
           regions_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(regions_);
@@ -1979,7 +1979,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearRegions() {
-        regions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        regions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -2000,7 +2000,7 @@ public final class ClusterShardingMessages {
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList regionProxies_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList regionProxies_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureRegionProxiesIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
           regionProxies_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(regionProxies_);
@@ -2088,7 +2088,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearRegionProxies() {
-        regionProxies_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        regionProxies_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
@@ -2109,7 +2109,7 @@ public final class ClusterShardingMessages {
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList unallocatedShards_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList unallocatedShards_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureUnallocatedShardsIsMutable() {
         if (!((bitField0_ & 0x00000008) != 0)) {
           unallocatedShards_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(unallocatedShards_);
@@ -2197,7 +2197,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearUnallocatedShards() {
-        unallocatedShards_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        unallocatedShards_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
@@ -5146,7 +5146,7 @@ public final class ClusterShardingMessages {
     }
     private ShardHomesEntry() {
       region_ = "";
-      shard_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      shard_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -5535,7 +5535,7 @@ public final class ClusterShardingMessages {
         super.clear();
         region_ = "";
         bitField0_ = (bitField0_ & ~0x00000001);
-        shard_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        shard_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
@@ -5755,7 +5755,7 @@ public final class ClusterShardingMessages {
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList shard_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList shard_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureShardIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
           shard_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(shard_);
@@ -5843,7 +5843,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearShard() {
-        shard_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        shard_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -6757,7 +6757,7 @@ public final class ClusterShardingMessages {
       super(builder);
     }
     private EntityState() {
-      entities_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      entities_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -7069,7 +7069,7 @@ public final class ClusterShardingMessages {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        entities_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        entities_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
@@ -7191,7 +7191,7 @@ public final class ClusterShardingMessages {
       }
       private int bitField0_;
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList entities_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList entities_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureEntitiesIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
           entities_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(entities_);
@@ -7279,7 +7279,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearEntities() {
-        entities_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        entities_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
@@ -8012,7 +8012,7 @@ public final class ClusterShardingMessages {
       super(builder);
     }
     private EntitiesStarted() {
-      entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -8324,7 +8324,7 @@ public final class ClusterShardingMessages {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
@@ -8446,7 +8446,7 @@ public final class ClusterShardingMessages {
       }
       private int bitField0_;
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureEntityIdIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
           entityId_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(entityId_);
@@ -8534,7 +8534,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
-        entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
@@ -9267,7 +9267,7 @@ public final class ClusterShardingMessages {
       super(builder);
     }
     private EntitiesStopped() {
-      entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -9579,7 +9579,7 @@ public final class ClusterShardingMessages {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
@@ -9701,7 +9701,7 @@ public final class ClusterShardingMessages {
       }
       private int bitField0_;
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureEntityIdIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
           entityId_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(entityId_);
@@ -9789,7 +9789,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
-        entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
@@ -10641,7 +10641,7 @@ public final class ClusterShardingMessages {
     }
     private ShardRegionStats() {
       stats_ = java.util.Collections.emptyList();
-      failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -11020,7 +11020,7 @@ public final class ClusterShardingMessages {
         } else {
           statsBuilder_.clear();
         }
-        failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
@@ -11417,7 +11417,7 @@ public final class ClusterShardingMessages {
         return statsBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureFailedIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
           failed_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(failed_);
@@ -11505,7 +11505,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearFailed() {
-        failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -17816,7 +17816,7 @@ public final class ClusterShardingMessages {
     }
     private CurrentShardState() {
       shardId_ = "";
-      entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -18201,7 +18201,7 @@ public final class ClusterShardingMessages {
         super.clear();
         shardId_ = "";
         bitField0_ = (bitField0_ & ~0x00000001);
-        entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
@@ -18421,7 +18421,7 @@ public final class ClusterShardingMessages {
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureEntityIdsIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
           entityIds_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(entityIds_);
@@ -18509,7 +18509,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearEntityIds() {
-        entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -18642,7 +18642,7 @@ public final class ClusterShardingMessages {
     }
     private ShardState() {
       shardId_ = "";
-      entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -19027,7 +19027,7 @@ public final class ClusterShardingMessages {
         super.clear();
         shardId_ = "";
         bitField0_ = (bitField0_ & ~0x00000001);
-        entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
@@ -19247,7 +19247,7 @@ public final class ClusterShardingMessages {
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureEntityIdsIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
           entityIds_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(entityIds_);
@@ -19335,7 +19335,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearEntityIds() {
-        entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -19475,7 +19475,7 @@ public final class ClusterShardingMessages {
     }
     private CurrentShardRegionState() {
       shards_ = java.util.Collections.emptyList();
-      failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -19860,7 +19860,7 @@ public final class ClusterShardingMessages {
         } else {
           shardsBuilder_.clear();
         }
-        failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
@@ -20262,7 +20262,7 @@ public final class ClusterShardingMessages {
         return shardsBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureFailedIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
           failed_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(failed_);
@@ -20350,7 +20350,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearFailed() {
-        failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -20476,7 +20476,7 @@ public final class ClusterShardingMessages {
       super(builder);
     }
     private RememberedShardState() {
-      shardId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      shardId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -20828,7 +20828,7 @@ public final class ClusterShardingMessages {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        shardId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        shardId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
         marker_ = false;
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -20961,7 +20961,7 @@ public final class ClusterShardingMessages {
       }
       private int bitField0_;
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList shardId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList shardId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureShardIdIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
           shardId_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(shardId_);
@@ -21049,7 +21049,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearShardId() {
-        shardId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        shardId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
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 f85b705cfc..cfa0db9ef8 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
@@ -69,7 +69,7 @@ public final class ClusterClientMessages {
       super(builder);
     }
     private Contacts() {
-      contactPoints_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      contactPoints_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -381,7 +381,7 @@ public final class ClusterClientMessages {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        contactPoints_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        contactPoints_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
@@ -503,7 +503,7 @@ public final class ClusterClientMessages {
       }
       private int bitField0_;
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList contactPoints_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList contactPoints_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureContactPointsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
           contactPoints_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(contactPoints_);
@@ -591,7 +591,7 @@ public final class ClusterClientMessages {
        * @return This builder for chaining.
        */
       public Builder clearContactPoints() {
-        contactPoints_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        contactPoints_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
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 e3af8da02b..95872be7df 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
@@ -7685,7 +7685,7 @@ public final class ReliableDelivery {
       super(builder);
     }
     private Cleanup() {
-      qualifiers_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      qualifiers_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -8001,7 +8001,7 @@ public final class ReliableDelivery {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        qualifiers_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        qualifiers_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
@@ -8123,7 +8123,7 @@ public final class ReliableDelivery {
       }
       private int bitField0_;
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList qualifiers_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList qualifiers_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureQualifiersIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
           qualifiers_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(qualifiers_);
@@ -8211,7 +8211,7 @@ public final class ReliableDelivery {
        * @return This builder for chaining.
        */
       public Builder clearQualifiers() {
-        qualifiers_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        qualifiers_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
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 da806d00e0..78b4abe103 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
@@ -380,7 +380,7 @@ public final class ClusterMessages {
       super(builder);
     }
     private Join() {
-      roles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      roles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       appVersion_ = "";
     }
 
@@ -832,7 +832,7 @@ public final class ClusterMessages {
           nodeBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000001);
-        roles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        roles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         appVersion_ = "";
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -1104,7 +1104,7 @@ public final class ClusterMessages {
         return nodeBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList roles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList roles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureRolesIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
           roles_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(roles_);
@@ -1192,7 +1192,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder clearRoles() {
-        roles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        roles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -7294,7 +7294,7 @@ public final class ClusterMessages {
       super(builder);
     }
     private GossipStatus() {
-      allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       seenDigest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     }
 
@@ -7779,7 +7779,7 @@ public final class ClusterMessages {
           fromBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000001);
-        allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         if (versionBuilder_ == null) {
           version_ = null;
@@ -8072,7 +8072,7 @@ public final class ClusterMessages {
         return fromBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureAllHashesIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
           allHashes_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(allHashes_);
@@ -8160,7 +8160,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder clearAllHashes() {
-        allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -8593,11 +8593,11 @@ public final class ClusterMessages {
     }
     private Gossip() {
       allAddresses_ = java.util.Collections.emptyList();
-      allRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
-      allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      allRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       members_ = java.util.Collections.emptyList();
       tombstones_ = java.util.Collections.emptyList();
-      allAppVersions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      allAppVersions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -9372,9 +9372,9 @@ public final class ClusterMessages {
         } else {
           allAddressesBuilder_.clear();
         }
-        allRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        allRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
-        allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000004);
         if (membersBuilder_ == null) {
           members_ = java.util.Collections.emptyList();
@@ -9400,7 +9400,7 @@ public final class ClusterMessages {
         } else {
           tombstonesBuilder_.clear();
         }
-        allAppVersions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        allAppVersions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000080);
         return this;
       }
@@ -9948,7 +9948,7 @@ public final class ClusterMessages {
         return allAddressesBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList allRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList allRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureAllRolesIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
           allRoles_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(allRoles_);
@@ -10036,7 +10036,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder clearAllRoles() {
-        allRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        allRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -10057,7 +10057,7 @@ public final class ClusterMessages {
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureAllHashesIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
           allHashes_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(allHashes_);
@@ -10145,7 +10145,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder clearAllHashes() {
-        allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
@@ -10886,7 +10886,7 @@ public final class ClusterMessages {
         return tombstonesBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList allAppVersions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList allAppVersions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureAllAppVersionsIsMutable() {
         if (!((bitField0_ & 0x00000080) != 0)) {
           allAppVersions_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(allAppVersions_);
@@ -10974,7 +10974,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder clearAllAppVersions() {
-        allAppVersions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        allAppVersions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000080);
         onChanged();
         return this;
@@ -21262,7 +21262,7 @@ public final class ClusterMessages {
     }
     private ClusterRouterPoolSettings() {
       useRole_ = "";
-      useRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      useRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -21776,7 +21776,7 @@ public final class ClusterMessages {
         bitField0_ = (bitField0_ & ~0x00000004);
         useRole_ = "";
         bitField0_ = (bitField0_ & ~0x00000008);
-        useRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        useRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
@@ -22134,7 +22134,7 @@ public final class ClusterMessages {
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList useRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList useRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureUseRolesIsMutable() {
         if (!((bitField0_ & 0x00000010) != 0)) {
           useRoles_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(useRoles_);
@@ -22222,7 +22222,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder clearUseRoles() {
-        useRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        useRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
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 88e0ca9d81..6ba398172f 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
@@ -387,11 +387,11 @@ public final class ReplicatedDataMessages {
       super(builder);
     }
     private GSet() {
-      stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       intElements_ = emptyIntList();
       longElements_ = emptyLongList();
       otherElements_ = java.util.Collections.emptyList();
-      actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -1007,7 +1007,7 @@ public final class ReplicatedDataMessages {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
         intElements_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -1019,7 +1019,7 @@ public final class ReplicatedDataMessages {
         } else {
           otherElementsBuilder_.clear();
         }
-        actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
@@ -1226,7 +1226,7 @@ public final class ReplicatedDataMessages {
       }
       private int bitField0_;
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureStringElementsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
           stringElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(stringElements_);
@@ -1314,7 +1314,7 @@ public final class ReplicatedDataMessages {
        * @return This builder for chaining.
        */
       public Builder clearStringElements() {
-        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
@@ -1733,7 +1733,7 @@ public final class ReplicatedDataMessages {
         return otherElementsBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureActorRefElementsIsMutable() {
         if (!((bitField0_ & 0x00000010) != 0)) {
           actorRefElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(actorRefElements_);
@@ -1853,7 +1853,7 @@ public final class ReplicatedDataMessages {
        * @return This builder for chaining.
        */
       public Builder clearActorRefElements() {
-        actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
@@ -2111,11 +2111,11 @@ public final class ReplicatedDataMessages {
     }
     private ORSet() {
       dots_ = java.util.Collections.emptyList();
-      stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       intElements_ = emptyIntList();
       longElements_ = emptyLongList();
       otherElements_ = java.util.Collections.emptyList();
-      actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -2872,7 +2872,7 @@ public final class ReplicatedDataMessages {
         } else {
           dotsBuilder_.clear();
         }
-        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000004);
         intElements_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000008);
@@ -2884,7 +2884,7 @@ public final class ReplicatedDataMessages {
         } else {
           otherElementsBuilder_.clear();
         }
-        actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000040);
         return this;
       }
@@ -3510,7 +3510,7 @@ public final class ReplicatedDataMessages {
         return dotsBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureStringElementsIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
           stringElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(stringElements_);
@@ -3598,7 +3598,7 @@ public final class ReplicatedDataMessages {
        * @return This builder for chaining.
        */
       public Builder clearStringElements() {
-        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
@@ -4017,7 +4017,7 @@ public final class ReplicatedDataMessages {
         return otherElementsBuilder_;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureActorRefElementsIsMutable() {
         if (!((bitField0_ & 0x00000040) != 0)) {
           actorRefElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(actorRefElements_);
@@ -4137,7 +4137,7 @@ public final class ReplicatedDataMessages {
        * @return This builder for chaining.
        */
       public Builder clearActorRefElements() {
-        actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000040);
         onChanged();
         return this;
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 4d672ce79c..364f1f378c 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
@@ -22152,7 +22152,7 @@ public final class ReplicatorMessages {
       super(builder);
     }
     private StringGSet() {
-      elements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      elements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -22464,7 +22464,7 @@ public final class ReplicatorMessages {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        elements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        elements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
@@ -22586,7 +22586,7 @@ public final class ReplicatorMessages {
       }
       private int bitField0_;
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList elements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList elements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureElementsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
           elements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(elements_);
@@ -22674,7 +22674,7 @@ public final class ReplicatorMessages {
        * @return This builder for chaining.
        */
       public Builder clearElements() {
-        elements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        elements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
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 33bcb26072..a5331180ae 100644
--- a/docs/src/main/java/docs/ddata/protobuf/msg/TwoPhaseSetMessages.java
+++ b/docs/src/main/java/docs/ddata/protobuf/msg/TwoPhaseSetMessages.java
@@ -94,8 +94,8 @@ public final class TwoPhaseSetMessages {
       super(builder);
     }
     private TwoPhaseSet() {
-      adds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
-      removals_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      adds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
+      removals_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -471,9 +471,9 @@ public final class TwoPhaseSetMessages {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        adds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        adds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
-        removals_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        removals_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
@@ -610,7 +610,7 @@ public final class TwoPhaseSetMessages {
       }
       private int bitField0_;
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList adds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList adds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureAddsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
           adds_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(adds_);
@@ -698,7 +698,7 @@ public final class TwoPhaseSetMessages {
        * @return This builder for chaining.
        */
       public Builder clearAdds() {
-        adds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        adds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
@@ -719,7 +719,7 @@ public final class TwoPhaseSetMessages {
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList removals_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList removals_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureRemovalsIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
           removals_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(removals_);
@@ -807,7 +807,7 @@ public final class TwoPhaseSetMessages {
        * @return This builder for chaining.
        */
       public Builder clearRemovals() {
-        removals_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        removals_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
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 84bcd1c2bc..5226491736 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
@@ -1516,7 +1516,7 @@ public final class ReplicatedEventSourcing {
     private ORSet() {
       originDc_ = "";
       dots_ = java.util.Collections.emptyList();
-      stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       intElements_ = emptyIntList();
       longElements_ = emptyLongList();
       otherElements_ = java.util.Collections.emptyList();
@@ -2340,7 +2340,7 @@ public final class ReplicatedEventSourcing {
         } else {
           dotsBuilder_.clear();
         }
-        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000008);
         intElements_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -3133,7 +3133,7 @@ public final class ReplicatedEventSourcing {
       }
 
       private org.apache.pekko.protobufv3.internal.LazyStringList stringElements_ =
-          org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
 
       private void ensureStringElementsIsMutable() {
         if (!((bitField0_ & 0x00000008) != 0)) {
@@ -3226,7 +3226,7 @@ public final class ReplicatedEventSourcing {
        * @return This builder for chaining.
        */
       public Builder clearStringElements() {
-        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 4edb8c10c9..7bdd653a80 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -30,7 +30,7 @@ object Dependencies {
   // https://github.com/real-logic/aeron/blob/1.x.y/build.gradle
   val agronaVersion = "1.19.2"
   val nettyVersion = "4.1.106.Final"
-  val protobufJavaVersion = "3.20.3"
+  val protobufJavaVersion = "3.23.4"
   val logbackVersion = "1.3.14"
 
   val jacksonCoreVersion = "2.16.1"
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 ce5c7a9c72..c5cf08dba3 100644
--- a/remote/src/main/java/org/apache/pekko/remote/ArteryControlFormats.java
+++ b/remote/src/main/java/org/apache/pekko/remote/ArteryControlFormats.java
@@ -2535,7 +2535,7 @@ public final class ArteryControlFormats {
       super(builder);
     }
     private CompressionTableAdvertisement() {
-      keys_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      keys_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       values_ = emptyIntList();
     }
 
@@ -3102,7 +3102,7 @@ public final class ArteryControlFormats {
         bitField0_ = (bitField0_ & ~0x00000002);
         tableVersion_ = 0;
         bitField0_ = (bitField0_ & ~0x00000004);
-        keys_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        keys_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000008);
         values_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -3474,7 +3474,7 @@ public final class ArteryControlFormats {
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList keys_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList keys_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureKeysIsMutable() {
         if (!((bitField0_ & 0x00000008) != 0)) {
           keys_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(keys_);
@@ -3610,7 +3610,7 @@ public final class ArteryControlFormats {
        * @return This builder for chaining.
        */
       public Builder clearKeys() {
-        keys_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        keys_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
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 62b3175bf0..6e4153b416 100644
--- a/remote/src/main/java/org/apache/pekko/remote/WireFormats.java
+++ b/remote/src/main/java/org/apache/pekko/remote/WireFormats.java
@@ -5886,7 +5886,7 @@ public final class WireFormats {
     private PropsData() {
       clazz_ = "";
       args_ = java.util.Collections.emptyList();
-      manifests_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      manifests_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       serializerIds_ = emptyIntList();
       hasManifest_ = emptyBooleanList();
     }
@@ -6586,7 +6586,7 @@ public final class WireFormats {
         bitField0_ = (bitField0_ & ~0x00000002);
         args_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000004);
-        manifests_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        manifests_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000008);
         serializerIds_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -7077,7 +7077,7 @@ public final class WireFormats {
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList manifests_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList manifests_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureManifestsIsMutable() {
         if (!((bitField0_ & 0x00000008) != 0)) {
           manifests_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(manifests_);
@@ -7213,7 +7213,7 @@ public final class WireFormats {
        * @return This builder for chaining.
        */
       public Builder clearManifests() {
-        manifests_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        manifests_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
@@ -7729,7 +7729,7 @@ public final class WireFormats {
       scopeManifest_ = "";
       configManifest_ = "";
       routerConfigManifest_ = "";
-      tags_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      tags_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
     }
 
     @java.lang.Override
@@ -8641,7 +8641,7 @@ public final class WireFormats {
         bitField0_ = (bitField0_ & ~0x00000200);
         routerConfigManifest_ = "";
         bitField0_ = (bitField0_ & ~0x00000400);
-        tags_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        tags_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000800);
         return this;
       }
@@ -9526,7 +9526,7 @@ public final class WireFormats {
         return this;
       }
 
-      private org.apache.pekko.protobufv3.internal.LazyStringList tags_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList tags_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
       private void ensureTagsIsMutable() {
         if (!((bitField0_ & 0x00000800) != 0)) {
           tags_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(tags_);
@@ -9614,7 +9614,7 @@ public final class WireFormats {
        * @return This builder for chaining.
        */
       public Builder clearTags() {
-        tags_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+        tags_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.emptyList();
         bitField0_ = (bitField0_ & ~0x00000800);
         onChanged();
         return this;