diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc
index 8e6d150c48..af2172c466 100644
--- a/src/google/protobuf/any.pb.cc
+++ b/src/google/protobuf/any.pb.cc
@@ -306,6 +306,7 @@ const ::_pbi::TcParseTable<1, 2, 0, 36, 2> Any::_table_ = {
 
 const ::google::protobuf::Message::ClassData Any::_class_data_ = {
     Any::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* Any::GetClassData() const {
   return &_class_data_;
diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc
index c244f60bb6..cce4b195f3 100644
--- a/src/google/protobuf/api.pb.cc
+++ b/src/google/protobuf/api.pb.cc
@@ -561,6 +561,7 @@ const ::_pbi::TcParseTable<3, 7, 4, 39, 2> Api::_table_ = {
 
 const ::google::protobuf::Message::ClassData Api::_class_data_ = {
     Api::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* Api::GetClassData() const {
   return &_class_data_;
@@ -928,6 +929,7 @@ const ::_pbi::TcParseTable<3, 7, 1, 68, 2> Method::_table_ = {
 
 const ::google::protobuf::Message::ClassData Method::_class_data_ = {
     Method::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* Method::GetClassData() const {
   return &_class_data_;
@@ -1171,6 +1173,7 @@ const ::_pbi::TcParseTable<1, 2, 0, 38, 2> Mixin::_table_ = {
 
 const ::google::protobuf::Message::ClassData Mixin::_class_data_ = {
     Mixin::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* Mixin::GetClassData() const {
   return &_class_data_;
diff --git a/src/google/protobuf/duration.pb.cc b/src/google/protobuf/duration.pb.cc
index d1d38e48fa..83c3bfc790 100644
--- a/src/google/protobuf/duration.pb.cc
+++ b/src/google/protobuf/duration.pb.cc
@@ -268,6 +268,7 @@ const ::_pbi::TcParseTable<1, 2, 0, 0, 2> Duration::_table_ = {
 
 const ::google::protobuf::Message::ClassData Duration::_class_data_ = {
     Duration::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* Duration::GetClassData() const {
   return &_class_data_;
diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc
index 7db49df6f8..c7ff777660 100644
--- a/src/google/protobuf/field_mask.pb.cc
+++ b/src/google/protobuf/field_mask.pb.cc
@@ -257,6 +257,7 @@ const ::_pbi::TcParseTable<0, 1, 0, 39, 2> FieldMask::_table_ = {
 
 const ::google::protobuf::Message::ClassData FieldMask::_class_data_ = {
     FieldMask::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* FieldMask::GetClassData() const {
   return &_class_data_;
diff --git a/src/google/protobuf/source_context.pb.cc b/src/google/protobuf/source_context.pb.cc
index 908f8abbd1..d4f5ccf7ca 100644
--- a/src/google/protobuf/source_context.pb.cc
+++ b/src/google/protobuf/source_context.pb.cc
@@ -260,6 +260,7 @@ const ::_pbi::TcParseTable<0, 1, 0, 47, 2> SourceContext::_table_ = {
 
 const ::google::protobuf::Message::ClassData SourceContext::_class_data_ = {
     SourceContext::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* SourceContext::GetClassData() const {
   return &_class_data_;
diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc
index 23a500e17d..1ecae36d5c 100644
--- a/src/google/protobuf/struct.pb.cc
+++ b/src/google/protobuf/struct.pb.cc
@@ -403,6 +403,7 @@ const ::_pbi::TcParseTable<0, 1, 2, 37, 2> Struct::_table_ = {
 
 const ::google::protobuf::Message::ClassData Struct::_class_data_ = {
     Struct::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* Struct::GetClassData() const {
   return &_class_data_;
@@ -774,6 +775,7 @@ const ::_pbi::TcParseTable<0, 6, 2, 42, 2> Value::_table_ = {
 
 const ::google::protobuf::Message::ClassData Value::_class_data_ = {
     Value::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* Value::GetClassData() const {
   return &_class_data_;
@@ -986,6 +988,7 @@ const ::_pbi::TcParseTable<0, 1, 1, 0, 2> ListValue::_table_ = {
 
 const ::google::protobuf::Message::ClassData ListValue::_class_data_ = {
     ListValue::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* ListValue::GetClassData() const {
   return &_class_data_;
diff --git a/src/google/protobuf/timestamp.pb.cc b/src/google/protobuf/timestamp.pb.cc
index 8a9736fb49..e12d0bacf1 100644
--- a/src/google/protobuf/timestamp.pb.cc
+++ b/src/google/protobuf/timestamp.pb.cc
@@ -268,6 +268,7 @@ const ::_pbi::TcParseTable<1, 2, 0, 0, 2> Timestamp::_table_ = {
 
 const ::google::protobuf::Message::ClassData Timestamp::_class_data_ = {
     Timestamp::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* Timestamp::GetClassData() const {
   return &_class_data_;
diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc
index d8d1ee40fb..3b3c4ec081 100644
--- a/src/google/protobuf/type.pb.cc
+++ b/src/google/protobuf/type.pb.cc
@@ -741,6 +741,7 @@ const ::_pbi::TcParseTable<3, 7, 3, 46, 2> Type::_table_ = {
 
 const ::google::protobuf::Message::ClassData Type::_class_data_ = {
     Type::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* Type::GetClassData() const {
   return &_class_data_;
@@ -1172,6 +1173,7 @@ const ::_pbi::TcParseTable<4, 10, 1, 72, 2> Field::_table_ = {
 
 const ::google::protobuf::Message::ClassData Field::_class_data_ = {
     Field::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* Field::GetClassData() const {
   return &_class_data_;
@@ -1552,6 +1554,7 @@ const ::_pbi::TcParseTable<3, 6, 3, 40, 2> Enum::_table_ = {
 
 const ::google::protobuf::Message::ClassData Enum::_class_data_ = {
     Enum::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* Enum::GetClassData() const {
   return &_class_data_;
@@ -1813,6 +1816,7 @@ const ::_pbi::TcParseTable<2, 3, 1, 38, 2> EnumValue::_table_ = {
 
 const ::google::protobuf::Message::ClassData EnumValue::_class_data_ = {
     EnumValue::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* EnumValue::GetClassData() const {
   return &_class_data_;
@@ -2060,6 +2064,7 @@ const ::_pbi::TcParseTable<1, 2, 1, 35, 2> Option::_table_ = {
 
 const ::google::protobuf::Message::ClassData Option::_class_data_ = {
     Option::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* Option::GetClassData() const {
   return &_class_data_;
diff --git a/src/google/protobuf/wrappers.pb.cc b/src/google/protobuf/wrappers.pb.cc
index 3dc4bb0735..5deb9703f0 100644
--- a/src/google/protobuf/wrappers.pb.cc
+++ b/src/google/protobuf/wrappers.pb.cc
@@ -499,6 +499,7 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> DoubleValue::_table_ = {
 
 const ::google::protobuf::Message::ClassData DoubleValue::_class_data_ = {
     DoubleValue::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* DoubleValue::GetClassData() const {
   return &_class_data_;
@@ -682,6 +683,7 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> FloatValue::_table_ = {
 
 const ::google::protobuf::Message::ClassData FloatValue::_class_data_ = {
     FloatValue::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* FloatValue::GetClassData() const {
   return &_class_data_;
@@ -856,6 +858,7 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> Int64Value::_table_ = {
 
 const ::google::protobuf::Message::ClassData Int64Value::_class_data_ = {
     Int64Value::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* Int64Value::GetClassData() const {
   return &_class_data_;
@@ -1025,6 +1028,7 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> UInt64Value::_table_ = {
 
 const ::google::protobuf::Message::ClassData UInt64Value::_class_data_ = {
     UInt64Value::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* UInt64Value::GetClassData() const {
   return &_class_data_;
@@ -1194,6 +1198,7 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> Int32Value::_table_ = {
 
 const ::google::protobuf::Message::ClassData Int32Value::_class_data_ = {
     Int32Value::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* Int32Value::GetClassData() const {
   return &_class_data_;
@@ -1363,6 +1368,7 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> UInt32Value::_table_ = {
 
 const ::google::protobuf::Message::ClassData UInt32Value::_class_data_ = {
     UInt32Value::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* UInt32Value::GetClassData() const {
   return &_class_data_;
@@ -1531,6 +1537,7 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> BoolValue::_table_ = {
 
 const ::google::protobuf::Message::ClassData BoolValue::_class_data_ = {
     BoolValue::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* BoolValue::GetClassData() const {
   return &_class_data_;
@@ -1718,6 +1725,7 @@ const ::_pbi::TcParseTable<0, 1, 0, 41, 2> StringValue::_table_ = {
 
 const ::google::protobuf::Message::ClassData StringValue::_class_data_ = {
     StringValue::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* StringValue::GetClassData() const {
   return &_class_data_;
@@ -1903,6 +1911,7 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> BytesValue::_table_ = {
 
 const ::google::protobuf::Message::ClassData BytesValue::_class_data_ = {
     BytesValue::MergeImpl,
+    nullptr,  // OnDemandRegisterArenaDtor
 };
 const ::google::protobuf::Message::ClassData* BytesValue::GetClassData() const {
   return &_class_data_;