diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc
index 47ebf5bd43..de4a905dc9 100644
--- a/src/google/protobuf/any.pb.cc
+++ b/src/google/protobuf/any.pb.cc
@@ -195,12 +195,15 @@ inline void Any::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 Any::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          Any::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(Any, _impl_._cached_size_),
+              false,
+          },
+          &Any::MergeImpl,
+          &Any::kDescriptorMethods,
       };
   return &_data_;
 }
diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc
index 915f05a5ec..10ce6495b8 100644
--- a/src/google/protobuf/api.pb.cc
+++ b/src/google/protobuf/api.pb.cc
@@ -325,12 +325,15 @@ inline void Api::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 Api::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          Api::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(Api, _impl_._cached_size_),
+              false,
+          },
+          &Api::MergeImpl,
+          &Api::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -714,12 +717,15 @@ inline void Method::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 Method::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          Method::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(Method, _impl_._cached_size_),
+              false,
+          },
+          &Method::MergeImpl,
+          &Method::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -1061,12 +1067,15 @@ inline void Mixin::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 Mixin::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          Mixin::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(Mixin, _impl_._cached_size_),
+              false,
+          },
+          &Mixin::MergeImpl,
+          &Mixin::kDescriptorMethods,
       };
   return &_data_;
 }
diff --git a/src/google/protobuf/duration.pb.cc b/src/google/protobuf/duration.pb.cc
index b9e1bf056d..0cd69b6eee 100644
--- a/src/google/protobuf/duration.pb.cc
+++ b/src/google/protobuf/duration.pb.cc
@@ -159,12 +159,15 @@ inline void Duration::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 Duration::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          Duration::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(Duration, _impl_._cached_size_),
+              false,
+          },
+          &Duration::MergeImpl,
+          &Duration::kDescriptorMethods,
       };
   return &_data_;
 }
diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc
index 4f7f02f9c4..d474ff38d5 100644
--- a/src/google/protobuf/field_mask.pb.cc
+++ b/src/google/protobuf/field_mask.pb.cc
@@ -165,12 +165,15 @@ inline void FieldMask::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 FieldMask::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          FieldMask::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(FieldMask, _impl_._cached_size_),
+              false,
+          },
+          &FieldMask::MergeImpl,
+          &FieldMask::kDescriptorMethods,
       };
   return &_data_;
 }
diff --git a/src/google/protobuf/source_context.pb.cc b/src/google/protobuf/source_context.pb.cc
index 3375db2f26..18898f0411 100644
--- a/src/google/protobuf/source_context.pb.cc
+++ b/src/google/protobuf/source_context.pb.cc
@@ -168,12 +168,15 @@ inline void SourceContext::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 SourceContext::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          SourceContext::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(SourceContext, _impl_._cached_size_),
+              false,
+          },
+          &SourceContext::MergeImpl,
+          &SourceContext::kDescriptorMethods,
       };
   return &_data_;
 }
diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc
index 429018c61d..8fbfe1ada6 100644
--- a/src/google/protobuf/struct.pb.cc
+++ b/src/google/protobuf/struct.pb.cc
@@ -286,12 +286,15 @@ inline void Struct::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 Struct::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          Struct::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(Struct, _impl_._cached_size_),
+              false,
+          },
+          &Struct::MergeImpl,
+          &Struct::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -592,12 +595,15 @@ void Value::clear_kind() {
 
 const ::google::protobuf::MessageLite::ClassData*
 Value::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          Value::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(Value, _impl_._cached_size_),
+              false,
+          },
+          &Value::MergeImpl,
+          &Value::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -912,12 +918,15 @@ inline void ListValue::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 ListValue::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          ListValue::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(ListValue, _impl_._cached_size_),
+              false,
+          },
+          &ListValue::MergeImpl,
+          &ListValue::kDescriptorMethods,
       };
   return &_data_;
 }
diff --git a/src/google/protobuf/timestamp.pb.cc b/src/google/protobuf/timestamp.pb.cc
index c8beb68e13..a60d9e7728 100644
--- a/src/google/protobuf/timestamp.pb.cc
+++ b/src/google/protobuf/timestamp.pb.cc
@@ -159,12 +159,15 @@ inline void Timestamp::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 Timestamp::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          Timestamp::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(Timestamp, _impl_._cached_size_),
+              false,
+          },
+          &Timestamp::MergeImpl,
+          &Timestamp::kDescriptorMethods,
       };
   return &_data_;
 }
diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc
index feddb6f739..fac84937f1 100644
--- a/src/google/protobuf/type.pb.cc
+++ b/src/google/protobuf/type.pb.cc
@@ -505,12 +505,15 @@ inline void Type::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 Type::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          Type::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(Type, _impl_._cached_size_),
+              false,
+          },
+          &Type::MergeImpl,
+          &Type::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -892,12 +895,15 @@ inline void Field::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 Field::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          Field::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(Field, _impl_._cached_size_),
+              false,
+          },
+          &Field::MergeImpl,
+          &Field::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -1340,12 +1346,15 @@ inline void Enum::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 Enum::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          Enum::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(Enum, _impl_._cached_size_),
+              false,
+          },
+          &Enum::MergeImpl,
+          &Enum::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -1684,12 +1693,15 @@ inline void EnumValue::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 EnumValue::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          EnumValue::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(EnumValue, _impl_._cached_size_),
+              false,
+          },
+          &EnumValue::MergeImpl,
+          &EnumValue::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -1942,12 +1954,15 @@ inline void Option::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 Option::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          Option::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(Option, _impl_._cached_size_),
+              false,
+          },
+          &Option::MergeImpl,
+          &Option::kDescriptorMethods,
       };
   return &_data_;
 }
diff --git a/src/google/protobuf/wrappers.pb.cc b/src/google/protobuf/wrappers.pb.cc
index a15d8f5737..0ed136b6dd 100644
--- a/src/google/protobuf/wrappers.pb.cc
+++ b/src/google/protobuf/wrappers.pb.cc
@@ -402,12 +402,15 @@ inline void DoubleValue::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 DoubleValue::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          DoubleValue::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(DoubleValue, _impl_._cached_size_),
+              false,
+          },
+          &DoubleValue::MergeImpl,
+          &DoubleValue::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -590,12 +593,15 @@ inline void FloatValue::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 FloatValue::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          FloatValue::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(FloatValue, _impl_._cached_size_),
+              false,
+          },
+          &FloatValue::MergeImpl,
+          &FloatValue::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -778,12 +784,15 @@ inline void Int64Value::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 Int64Value::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          Int64Value::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(Int64Value, _impl_._cached_size_),
+              false,
+          },
+          &Int64Value::MergeImpl,
+          &Int64Value::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -952,12 +961,15 @@ inline void UInt64Value::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 UInt64Value::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          UInt64Value::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(UInt64Value, _impl_._cached_size_),
+              false,
+          },
+          &UInt64Value::MergeImpl,
+          &UInt64Value::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -1126,12 +1138,15 @@ inline void Int32Value::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 Int32Value::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          Int32Value::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(Int32Value, _impl_._cached_size_),
+              false,
+          },
+          &Int32Value::MergeImpl,
+          &Int32Value::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -1300,12 +1315,15 @@ inline void UInt32Value::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 UInt32Value::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          UInt32Value::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(UInt32Value, _impl_._cached_size_),
+              false,
+          },
+          &UInt32Value::MergeImpl,
+          &UInt32Value::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -1474,12 +1492,15 @@ inline void BoolValue::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 BoolValue::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          BoolValue::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(BoolValue, _impl_._cached_size_),
+              false,
+          },
+          &BoolValue::MergeImpl,
+          &BoolValue::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -1661,12 +1682,15 @@ inline void StringValue::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 StringValue::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          StringValue::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(StringValue, _impl_._cached_size_),
+              false,
+          },
+          &StringValue::MergeImpl,
+          &StringValue::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -1855,12 +1879,15 @@ inline void BytesValue::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 BytesValue::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          BytesValue::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(BytesValue, _impl_._cached_size_),
+              false,
+          },
+          &BytesValue::MergeImpl,
+          &BytesValue::kDescriptorMethods,
       };
   return &_data_;
 }