diff --git a/src/file_lists.cmake b/src/file_lists.cmake
index a83f17bb9c..f44cf0dffe 100644
--- a/src/file_lists.cmake
+++ b/src/file_lists.cmake
@@ -745,6 +745,7 @@ set(compiler_test_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/code_generator_unittest.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface_unittest.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/bootstrap_unittest.cc
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/file_unittest.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/generator_unittest.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/message_size_unittest.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/metadata_test.cc
diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc
index ac4b71dfa2..201db71211 100644
--- a/src/google/protobuf/api.pb.cc
+++ b/src/google/protobuf/api.pb.cc
@@ -23,34 +23,28 @@ namespace _fl = ::google::protobuf::internal::field_layout;
 namespace google {
 namespace protobuf {
         template <typename>
-PROTOBUF_CONSTEXPR Api::Api(::_pbi::ConstantInitialized)
+PROTOBUF_CONSTEXPR Mixin::Mixin(::_pbi::ConstantInitialized)
     : _impl_{
-      /*decltype(_impl_._has_bits_)*/ {},
-      /*decltype(_impl_._cached_size_)*/ {},
-      /*decltype(_impl_.methods_)*/ {},
-      /*decltype(_impl_.options_)*/ {},
-      /*decltype(_impl_.mixins_)*/ {},
       /*decltype(_impl_.name_)*/ {
           &::_pbi::fixed_address_empty_string,
           ::_pbi::ConstantInitialized{},
       },
-      /*decltype(_impl_.version_)*/ {
+      /*decltype(_impl_.root_)*/ {
           &::_pbi::fixed_address_empty_string,
           ::_pbi::ConstantInitialized{},
       },
-      /*decltype(_impl_.source_context_)*/ nullptr,
-      /*decltype(_impl_.syntax_)*/ 0,
+      /*decltype(_impl_._cached_size_)*/ {},
     } {}
-struct ApiDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ApiDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ApiDefaultTypeInternal() {}
+struct MixinDefaultTypeInternal {
+  PROTOBUF_CONSTEXPR MixinDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
+  ~MixinDefaultTypeInternal() {}
   union {
-    Api _instance;
+    Mixin _instance;
   };
 };
 
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ApiDefaultTypeInternal _Api_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MixinDefaultTypeInternal _Mixin_default_instance_;
         template <typename>
 PROTOBUF_CONSTEXPR Method::Method(::_pbi::ConstantInitialized)
     : _impl_{
@@ -83,28 +77,34 @@ struct MethodDefaultTypeInternal {
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
     PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MethodDefaultTypeInternal _Method_default_instance_;
         template <typename>
-PROTOBUF_CONSTEXPR Mixin::Mixin(::_pbi::ConstantInitialized)
+PROTOBUF_CONSTEXPR Api::Api(::_pbi::ConstantInitialized)
     : _impl_{
+      /*decltype(_impl_._has_bits_)*/ {},
+      /*decltype(_impl_._cached_size_)*/ {},
+      /*decltype(_impl_.methods_)*/ {},
+      /*decltype(_impl_.options_)*/ {},
+      /*decltype(_impl_.mixins_)*/ {},
       /*decltype(_impl_.name_)*/ {
           &::_pbi::fixed_address_empty_string,
           ::_pbi::ConstantInitialized{},
       },
-      /*decltype(_impl_.root_)*/ {
+      /*decltype(_impl_.version_)*/ {
           &::_pbi::fixed_address_empty_string,
           ::_pbi::ConstantInitialized{},
       },
-      /*decltype(_impl_._cached_size_)*/ {},
+      /*decltype(_impl_.source_context_)*/ nullptr,
+      /*decltype(_impl_.syntax_)*/ 0,
     } {}
-struct MixinDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR MixinDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~MixinDefaultTypeInternal() {}
+struct ApiDefaultTypeInternal {
+  PROTOBUF_CONSTEXPR ApiDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
+  ~ApiDefaultTypeInternal() {}
   union {
-    Mixin _instance;
+    Api _instance;
   };
 };
 
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MixinDefaultTypeInternal _Mixin_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ApiDefaultTypeInternal _Api_default_instance_;
 }  // namespace protobuf
 }  // namespace google
 static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fapi_2eproto[3];
diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
index 871baf03bc..6a193fbddd 100644
--- a/src/google/protobuf/api.pb.h
+++ b/src/google/protobuf/api.pb.h
@@ -77,25 +77,25 @@ namespace protobuf {
 
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Api final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Api) */ {
+class PROTOBUF_EXPORT Mixin final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Mixin) */ {
  public:
-  inline Api() : Api(nullptr) {}
-  ~Api() override;
+  inline Mixin() : Mixin(nullptr) {}
+  ~Mixin() override;
   template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Api(::google::protobuf::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR Mixin(::google::protobuf::internal::ConstantInitialized);
 
-  Api(const Api& from);
-  Api(Api&& from) noexcept
-    : Api() {
+  Mixin(const Mixin& from);
+  Mixin(Mixin&& from) noexcept
+    : Mixin() {
     *this = ::std::move(from);
   }
 
-  inline Api& operator=(const Api& from) {
+  inline Mixin& operator=(const Mixin& from) {
     CopyFrom(from);
     return *this;
   }
-  inline Api& operator=(Api&& from) noexcept {
+  inline Mixin& operator=(Mixin&& from) noexcept {
     if (this == &from) return *this;
     if (GetOwningArena() == from.GetOwningArena()
   #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
@@ -125,20 +125,20 @@ class PROTOBUF_EXPORT Api final :
   static const ::google::protobuf::Reflection* GetReflection() {
     return default_instance().GetMetadata().reflection;
   }
-  static const Api& default_instance() {
+  static const Mixin& default_instance() {
     return *internal_default_instance();
   }
-  static inline const Api* internal_default_instance() {
-    return reinterpret_cast<const Api*>(
-               &_Api_default_instance_);
+  static inline const Mixin* internal_default_instance() {
+    return reinterpret_cast<const Mixin*>(
+               &_Mixin_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    0;
+    2;
 
-  friend void swap(Api& a, Api& b) {
+  friend void swap(Mixin& a, Mixin& b) {
     a.Swap(&b);
   }
-  inline void Swap(Api* other) {
+  inline void Swap(Mixin* other) {
     if (other == this) return;
   #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetOwningArena() != nullptr &&
@@ -151,7 +151,7 @@ class PROTOBUF_EXPORT Api final :
       ::google::protobuf::internal::GenericSwap(this, other);
     }
   }
-  void UnsafeArenaSwap(Api* other) {
+  void UnsafeArenaSwap(Mixin* other) {
     if (other == this) return;
     ABSL_DCHECK(GetOwningArena() == other->GetOwningArena());
     InternalSwap(other);
@@ -159,14 +159,14 @@ class PROTOBUF_EXPORT Api final :
 
   // implements Message ----------------------------------------------
 
-  Api* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Api>(arena);
+  Mixin* New(::google::protobuf::Arena* arena = nullptr) const final {
+    return CreateMaybeMessage<Mixin>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const Api& from);
+  void CopyFrom(const Mixin& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Api& from) {
-    Api::MergeImpl(*this, from);
+  void MergeFrom( const Mixin& from) {
+    Mixin::MergeImpl(*this, from);
   }
   private:
   static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
@@ -184,15 +184,15 @@ class PROTOBUF_EXPORT Api final :
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void SetCachedSize(int size) const final;
-  void InternalSwap(Api* other);
+  void InternalSwap(Mixin* other);
 
   private:
   friend class ::google::protobuf::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "google.protobuf.Api";
+    return "google.protobuf.Mixin";
   }
   protected:
-  explicit Api(::google::protobuf::Arena* arena);
+  explicit Mixin(::google::protobuf::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -205,68 +205,9 @@ class PROTOBUF_EXPORT Api final :
   // accessors -------------------------------------------------------
 
   enum : int {
-    kMethodsFieldNumber = 2,
-    kOptionsFieldNumber = 3,
-    kMixinsFieldNumber = 6,
     kNameFieldNumber = 1,
-    kVersionFieldNumber = 4,
-    kSourceContextFieldNumber = 5,
-    kSyntaxFieldNumber = 7,
+    kRootFieldNumber = 2,
   };
-  // repeated .google.protobuf.Method methods = 2;
-  int methods_size() const;
-  private:
-  int _internal_methods_size() const;
-
-  public:
-  void clear_methods() ;
-  ::google::protobuf::Method* mutable_methods(int index);
-  ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method >*
-      mutable_methods();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>& _internal_methods() const;
-  ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>* _internal_mutable_methods();
-  public:
-  const ::google::protobuf::Method& methods(int index) const;
-  ::google::protobuf::Method* add_methods();
-  const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method >&
-      methods() const;
-  // repeated .google.protobuf.Option options = 3;
-  int options_size() const;
-  private:
-  int _internal_options_size() const;
-
-  public:
-  void clear_options() ;
-  ::google::protobuf::Option* mutable_options(int index);
-  ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >*
-      mutable_options();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>& _internal_options() const;
-  ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* _internal_mutable_options();
-  public:
-  const ::google::protobuf::Option& options(int index) const;
-  ::google::protobuf::Option* add_options();
-  const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >&
-      options() const;
-  // repeated .google.protobuf.Mixin mixins = 6;
-  int mixins_size() const;
-  private:
-  int _internal_mixins_size() const;
-
-  public:
-  void clear_mixins() ;
-  ::google::protobuf::Mixin* mutable_mixins(int index);
-  ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >*
-      mutable_mixins();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>& _internal_mixins() const;
-  ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>* _internal_mutable_mixins();
-  public:
-  const ::google::protobuf::Mixin& mixins(int index) const;
-  ::google::protobuf::Mixin* add_mixins();
-  const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >&
-      mixins() const;
   // string name = 1;
   void clear_name() ;
   const std::string& name() const;
@@ -283,69 +224,38 @@ class PROTOBUF_EXPORT Api final :
   std::string* _internal_mutable_name();
 
   public:
-  // string version = 4;
-  void clear_version() ;
-  const std::string& version() const;
+  // string root = 2;
+  void clear_root() ;
+  const std::string& root() const;
   template <typename Arg_ = const std::string&, typename... Args_>
-  void set_version(Arg_&& arg, Args_... args);
-  std::string* mutable_version();
-  PROTOBUF_NODISCARD std::string* release_version();
-  void set_allocated_version(std::string* ptr);
+  void set_root(Arg_&& arg, Args_... args);
+  std::string* mutable_root();
+  PROTOBUF_NODISCARD std::string* release_root();
+  void set_allocated_root(std::string* ptr);
 
   private:
-  const std::string& _internal_version() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_version(
+  const std::string& _internal_root() const;
+  inline PROTOBUF_ALWAYS_INLINE void _internal_set_root(
       const std::string& value);
-  std::string* _internal_mutable_version();
-
-  public:
-  // .google.protobuf.SourceContext source_context = 5;
-  bool has_source_context() const;
-  void clear_source_context() ;
-  const ::google::protobuf::SourceContext& source_context() const;
-  PROTOBUF_NODISCARD ::google::protobuf::SourceContext* release_source_context();
-  ::google::protobuf::SourceContext* mutable_source_context();
-  void set_allocated_source_context(::google::protobuf::SourceContext* value);
-  void unsafe_arena_set_allocated_source_context(::google::protobuf::SourceContext* value);
-  ::google::protobuf::SourceContext* unsafe_arena_release_source_context();
-
-  private:
-  const ::google::protobuf::SourceContext& _internal_source_context() const;
-  ::google::protobuf::SourceContext* _internal_mutable_source_context();
-
-  public:
-  // .google.protobuf.Syntax syntax = 7;
-  void clear_syntax() ;
-  ::google::protobuf::Syntax syntax() const;
-  void set_syntax(::google::protobuf::Syntax value);
-
-  private:
-  ::google::protobuf::Syntax _internal_syntax() const;
-  void _internal_set_syntax(::google::protobuf::Syntax value);
+  std::string* _internal_mutable_root();
 
   public:
-  // @@protoc_insertion_point(class_scope:google.protobuf.Api)
+  // @@protoc_insertion_point(class_scope:google.protobuf.Mixin)
  private:
   class _Internal;
 
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
-      3, 7, 4,
-      39, 2>
+      1, 2, 0,
+      38, 2>
       _table_;
   template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
   struct Impl_ {
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method > methods_;
-    ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option > options_;
-    ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin > mixins_;
     ::google::protobuf::internal::ArenaStringPtr name_;
-    ::google::protobuf::internal::ArenaStringPtr version_;
-    ::google::protobuf::SourceContext* source_context_;
-    int syntax_;
+    ::google::protobuf::internal::ArenaStringPtr root_;
+    mutable ::google::protobuf::internal::CachedSize _cached_size_;
     PROTOBUF_TSAN_DECLARE_MEMBER;
   };
   union { Impl_ _impl_; };
@@ -611,25 +521,25 @@ class PROTOBUF_EXPORT Method final :
   friend struct ::TableStruct_google_2fprotobuf_2fapi_2eproto;
 };// -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Mixin final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Mixin) */ {
+class PROTOBUF_EXPORT Api final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Api) */ {
  public:
-  inline Mixin() : Mixin(nullptr) {}
-  ~Mixin() override;
+  inline Api() : Api(nullptr) {}
+  ~Api() override;
   template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Mixin(::google::protobuf::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR Api(::google::protobuf::internal::ConstantInitialized);
 
-  Mixin(const Mixin& from);
-  Mixin(Mixin&& from) noexcept
-    : Mixin() {
+  Api(const Api& from);
+  Api(Api&& from) noexcept
+    : Api() {
     *this = ::std::move(from);
   }
 
-  inline Mixin& operator=(const Mixin& from) {
+  inline Api& operator=(const Api& from) {
     CopyFrom(from);
     return *this;
   }
-  inline Mixin& operator=(Mixin&& from) noexcept {
+  inline Api& operator=(Api&& from) noexcept {
     if (this == &from) return *this;
     if (GetOwningArena() == from.GetOwningArena()
   #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
@@ -659,20 +569,20 @@ class PROTOBUF_EXPORT Mixin final :
   static const ::google::protobuf::Reflection* GetReflection() {
     return default_instance().GetMetadata().reflection;
   }
-  static const Mixin& default_instance() {
+  static const Api& default_instance() {
     return *internal_default_instance();
   }
-  static inline const Mixin* internal_default_instance() {
-    return reinterpret_cast<const Mixin*>(
-               &_Mixin_default_instance_);
+  static inline const Api* internal_default_instance() {
+    return reinterpret_cast<const Api*>(
+               &_Api_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    2;
+    0;
 
-  friend void swap(Mixin& a, Mixin& b) {
+  friend void swap(Api& a, Api& b) {
     a.Swap(&b);
   }
-  inline void Swap(Mixin* other) {
+  inline void Swap(Api* other) {
     if (other == this) return;
   #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetOwningArena() != nullptr &&
@@ -685,7 +595,7 @@ class PROTOBUF_EXPORT Mixin final :
       ::google::protobuf::internal::GenericSwap(this, other);
     }
   }
-  void UnsafeArenaSwap(Mixin* other) {
+  void UnsafeArenaSwap(Api* other) {
     if (other == this) return;
     ABSL_DCHECK(GetOwningArena() == other->GetOwningArena());
     InternalSwap(other);
@@ -693,14 +603,14 @@ class PROTOBUF_EXPORT Mixin final :
 
   // implements Message ----------------------------------------------
 
-  Mixin* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Mixin>(arena);
+  Api* New(::google::protobuf::Arena* arena = nullptr) const final {
+    return CreateMaybeMessage<Api>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const Mixin& from);
+  void CopyFrom(const Api& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Mixin& from) {
-    Mixin::MergeImpl(*this, from);
+  void MergeFrom( const Api& from) {
+    Api::MergeImpl(*this, from);
   }
   private:
   static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
@@ -718,15 +628,15 @@ class PROTOBUF_EXPORT Mixin final :
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void SetCachedSize(int size) const final;
-  void InternalSwap(Mixin* other);
+  void InternalSwap(Api* other);
 
   private:
   friend class ::google::protobuf::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "google.protobuf.Mixin";
+    return "google.protobuf.Api";
   }
   protected:
-  explicit Mixin(::google::protobuf::Arena* arena);
+  explicit Api(::google::protobuf::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -739,9 +649,68 @@ class PROTOBUF_EXPORT Mixin final :
   // accessors -------------------------------------------------------
 
   enum : int {
+    kMethodsFieldNumber = 2,
+    kOptionsFieldNumber = 3,
+    kMixinsFieldNumber = 6,
     kNameFieldNumber = 1,
-    kRootFieldNumber = 2,
+    kVersionFieldNumber = 4,
+    kSourceContextFieldNumber = 5,
+    kSyntaxFieldNumber = 7,
   };
+  // repeated .google.protobuf.Method methods = 2;
+  int methods_size() const;
+  private:
+  int _internal_methods_size() const;
+
+  public:
+  void clear_methods() ;
+  ::google::protobuf::Method* mutable_methods(int index);
+  ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method >*
+      mutable_methods();
+  private:
+  const ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>& _internal_methods() const;
+  ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>* _internal_mutable_methods();
+  public:
+  const ::google::protobuf::Method& methods(int index) const;
+  ::google::protobuf::Method* add_methods();
+  const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method >&
+      methods() const;
+  // repeated .google.protobuf.Option options = 3;
+  int options_size() const;
+  private:
+  int _internal_options_size() const;
+
+  public:
+  void clear_options() ;
+  ::google::protobuf::Option* mutable_options(int index);
+  ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >*
+      mutable_options();
+  private:
+  const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>& _internal_options() const;
+  ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* _internal_mutable_options();
+  public:
+  const ::google::protobuf::Option& options(int index) const;
+  ::google::protobuf::Option* add_options();
+  const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >&
+      options() const;
+  // repeated .google.protobuf.Mixin mixins = 6;
+  int mixins_size() const;
+  private:
+  int _internal_mixins_size() const;
+
+  public:
+  void clear_mixins() ;
+  ::google::protobuf::Mixin* mutable_mixins(int index);
+  ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >*
+      mutable_mixins();
+  private:
+  const ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>& _internal_mixins() const;
+  ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>* _internal_mutable_mixins();
+  public:
+  const ::google::protobuf::Mixin& mixins(int index) const;
+  ::google::protobuf::Mixin* add_mixins();
+  const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >&
+      mixins() const;
   // string name = 1;
   void clear_name() ;
   const std::string& name() const;
@@ -758,38 +727,69 @@ class PROTOBUF_EXPORT Mixin final :
   std::string* _internal_mutable_name();
 
   public:
-  // string root = 2;
-  void clear_root() ;
-  const std::string& root() const;
+  // string version = 4;
+  void clear_version() ;
+  const std::string& version() const;
   template <typename Arg_ = const std::string&, typename... Args_>
-  void set_root(Arg_&& arg, Args_... args);
-  std::string* mutable_root();
-  PROTOBUF_NODISCARD std::string* release_root();
-  void set_allocated_root(std::string* ptr);
+  void set_version(Arg_&& arg, Args_... args);
+  std::string* mutable_version();
+  PROTOBUF_NODISCARD std::string* release_version();
+  void set_allocated_version(std::string* ptr);
 
   private:
-  const std::string& _internal_root() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_root(
+  const std::string& _internal_version() const;
+  inline PROTOBUF_ALWAYS_INLINE void _internal_set_version(
       const std::string& value);
-  std::string* _internal_mutable_root();
+  std::string* _internal_mutable_version();
 
   public:
-  // @@protoc_insertion_point(class_scope:google.protobuf.Mixin)
+  // .google.protobuf.SourceContext source_context = 5;
+  bool has_source_context() const;
+  void clear_source_context() ;
+  const ::google::protobuf::SourceContext& source_context() const;
+  PROTOBUF_NODISCARD ::google::protobuf::SourceContext* release_source_context();
+  ::google::protobuf::SourceContext* mutable_source_context();
+  void set_allocated_source_context(::google::protobuf::SourceContext* value);
+  void unsafe_arena_set_allocated_source_context(::google::protobuf::SourceContext* value);
+  ::google::protobuf::SourceContext* unsafe_arena_release_source_context();
+
+  private:
+  const ::google::protobuf::SourceContext& _internal_source_context() const;
+  ::google::protobuf::SourceContext* _internal_mutable_source_context();
+
+  public:
+  // .google.protobuf.Syntax syntax = 7;
+  void clear_syntax() ;
+  ::google::protobuf::Syntax syntax() const;
+  void set_syntax(::google::protobuf::Syntax value);
+
+  private:
+  ::google::protobuf::Syntax _internal_syntax() const;
+  void _internal_set_syntax(::google::protobuf::Syntax value);
+
+  public:
+  // @@protoc_insertion_point(class_scope:google.protobuf.Api)
  private:
   class _Internal;
 
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 0,
-      38, 2>
+      3, 7, 4,
+      39, 2>
       _table_;
   template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
   struct Impl_ {
-    ::google::protobuf::internal::ArenaStringPtr name_;
-    ::google::protobuf::internal::ArenaStringPtr root_;
+    ::google::protobuf::internal::HasBits<1> _has_bits_;
     mutable ::google::protobuf::internal::CachedSize _cached_size_;
+    ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method > methods_;
+    ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option > options_;
+    ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin > mixins_;
+    ::google::protobuf::internal::ArenaStringPtr name_;
+    ::google::protobuf::internal::ArenaStringPtr version_;
+    ::google::protobuf::SourceContext* source_context_;
+    int syntax_;
     PROTOBUF_TSAN_DECLARE_MEMBER;
   };
   union { Impl_ _impl_; };
diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc
index 2fdc70f76f..89f31bed02 100644
--- a/src/google/protobuf/struct.pb.cc
+++ b/src/google/protobuf/struct.pb.cc
@@ -22,18 +22,22 @@ namespace _pbi = ::google::protobuf::internal;
 namespace _fl = ::google::protobuf::internal::field_layout;
 namespace google {
 namespace protobuf {
-      template <typename>
-PROTOBUF_CONSTEXPR Struct_FieldsEntry_DoNotUse::Struct_FieldsEntry_DoNotUse(::_pbi::ConstantInitialized) {}
-struct Struct_FieldsEntry_DoNotUseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR Struct_FieldsEntry_DoNotUseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~Struct_FieldsEntry_DoNotUseDefaultTypeInternal() {}
+        template <typename>
+PROTOBUF_CONSTEXPR ListValue::ListValue(::_pbi::ConstantInitialized)
+    : _impl_{
+      /*decltype(_impl_.values_)*/ {},
+      /*decltype(_impl_._cached_size_)*/ {},
+    } {}
+struct ListValueDefaultTypeInternal {
+  PROTOBUF_CONSTEXPR ListValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
+  ~ListValueDefaultTypeInternal() {}
   union {
-    Struct_FieldsEntry_DoNotUse _instance;
+    ListValue _instance;
   };
 };
 
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 Struct_FieldsEntry_DoNotUseDefaultTypeInternal _Struct_FieldsEntry_DoNotUse_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ListValueDefaultTypeInternal _ListValue_default_instance_;
         template <typename>
 PROTOBUF_CONSTEXPR Struct::Struct(::_pbi::ConstantInitialized)
     : _impl_{
@@ -50,6 +54,18 @@ struct StructDefaultTypeInternal {
 
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
     PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 StructDefaultTypeInternal _Struct_default_instance_;
+      template <typename>
+PROTOBUF_CONSTEXPR Struct_FieldsEntry_DoNotUse::Struct_FieldsEntry_DoNotUse(::_pbi::ConstantInitialized) {}
+struct Struct_FieldsEntry_DoNotUseDefaultTypeInternal {
+  PROTOBUF_CONSTEXPR Struct_FieldsEntry_DoNotUseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
+  ~Struct_FieldsEntry_DoNotUseDefaultTypeInternal() {}
+  union {
+    Struct_FieldsEntry_DoNotUse _instance;
+  };
+};
+
+PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 Struct_FieldsEntry_DoNotUseDefaultTypeInternal _Struct_FieldsEntry_DoNotUse_default_instance_;
         template <typename>
 PROTOBUF_CONSTEXPR Value::Value(::_pbi::ConstantInitialized)
     : _impl_{
@@ -67,22 +83,6 @@ struct ValueDefaultTypeInternal {
 
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
     PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ValueDefaultTypeInternal _Value_default_instance_;
-        template <typename>
-PROTOBUF_CONSTEXPR ListValue::ListValue(::_pbi::ConstantInitialized)
-    : _impl_{
-      /*decltype(_impl_.values_)*/ {},
-      /*decltype(_impl_._cached_size_)*/ {},
-    } {}
-struct ListValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ListValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ListValueDefaultTypeInternal() {}
-  union {
-    ListValue _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ListValueDefaultTypeInternal _ListValue_default_instance_;
 }  // namespace protobuf
 }  // namespace google
 static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fstruct_2eproto[4];
diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h
index 880b7129ea..0605c829a7 100644
--- a/src/google/protobuf/struct.pb.h
+++ b/src/google/protobuf/struct.pb.h
@@ -113,31 +113,174 @@ inline bool NullValue_Parse(absl::string_view name, NullValue* value) {
 
 // -------------------------------------------------------------------
 
-class Struct_FieldsEntry_DoNotUse final : public ::google::protobuf::internal::MapEntry<Struct_FieldsEntry_DoNotUse, 
-    std::string, ::google::protobuf::Value,
-    ::google::protobuf::internal::WireFormatLite::TYPE_STRING,
-    ::google::protobuf::internal::WireFormatLite::TYPE_MESSAGE> {
-public:
-  typedef ::google::protobuf::internal::MapEntry<Struct_FieldsEntry_DoNotUse, 
-    std::string, ::google::protobuf::Value,
-    ::google::protobuf::internal::WireFormatLite::TYPE_STRING,
-    ::google::protobuf::internal::WireFormatLite::TYPE_MESSAGE> SuperType;
-  Struct_FieldsEntry_DoNotUse();
-  template <typename = void>
-  explicit PROTOBUF_CONSTEXPR Struct_FieldsEntry_DoNotUse(
-      ::google::protobuf::internal::ConstantInitialized);
-  explicit Struct_FieldsEntry_DoNotUse(::google::protobuf::Arena* arena);
-  void MergeFrom(const Struct_FieldsEntry_DoNotUse& other);
-  static const Struct_FieldsEntry_DoNotUse* internal_default_instance() { return reinterpret_cast<const Struct_FieldsEntry_DoNotUse*>(&_Struct_FieldsEntry_DoNotUse_default_instance_); }
-  static bool ValidateKey(std::string* s) {
-    return ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(s->data(), static_cast<int>(s->size()), ::google::protobuf::internal::WireFormatLite::PARSE, "google.protobuf.Struct.FieldsEntry.key");
- }
-  static bool ValidateValue(void*) { return true; }
+class PROTOBUF_EXPORT ListValue final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.ListValue) */ {
+ public:
+  inline ListValue() : ListValue(nullptr) {}
+  ~ListValue() override;
+  template<typename = void>
+  explicit PROTOBUF_CONSTEXPR ListValue(::google::protobuf::internal::ConstantInitialized);
+
+  ListValue(const ListValue& from);
+  ListValue(ListValue&& from) noexcept
+    : ListValue() {
+    *this = ::std::move(from);
+  }
+
+  inline ListValue& operator=(const ListValue& from) {
+    CopyFrom(from);
+    return *this;
+  }
+  inline ListValue& operator=(ListValue&& from) noexcept {
+    if (this == &from) return *this;
+    if (GetOwningArena() == from.GetOwningArena()
+  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
+        && GetOwningArena() != nullptr
+  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
+    ) {
+      InternalSwap(&from);
+    } else {
+      CopyFrom(from);
+    }
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
+  }
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor() {
+    return GetDescriptor();
+  }
+  static const ::google::protobuf::Descriptor* GetDescriptor() {
+    return default_instance().GetMetadata().descriptor;
+  }
+  static const ::google::protobuf::Reflection* GetReflection() {
+    return default_instance().GetMetadata().reflection;
+  }
+  static const ListValue& default_instance() {
+    return *internal_default_instance();
+  }
+  static inline const ListValue* internal_default_instance() {
+    return reinterpret_cast<const ListValue*>(
+               &_ListValue_default_instance_);
+  }
+  static constexpr int kIndexInFileMessages =
+    3;
+
+  friend void swap(ListValue& a, ListValue& b) {
+    a.Swap(&b);
+  }
+  inline void Swap(ListValue* other) {
+    if (other == this) return;
+  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
+    if (GetOwningArena() != nullptr &&
+        GetOwningArena() == other->GetOwningArena()) {
+   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
+    if (GetOwningArena() == other->GetOwningArena()) {
+  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
+      InternalSwap(other);
+    } else {
+      ::google::protobuf::internal::GenericSwap(this, other);
+    }
+  }
+  void UnsafeArenaSwap(ListValue* other) {
+    if (other == this) return;
+    ABSL_DCHECK(GetOwningArena() == other->GetOwningArena());
+    InternalSwap(other);
+  }
+
+  // implements Message ----------------------------------------------
+
+  ListValue* New(::google::protobuf::Arena* arena = nullptr) const final {
+    return CreateMaybeMessage<ListValue>(arena);
+  }
+  using ::google::protobuf::Message::CopyFrom;
+  void CopyFrom(const ListValue& from);
   using ::google::protobuf::Message::MergeFrom;
+  void MergeFrom( const ListValue& from) {
+    ListValue::MergeImpl(*this, from);
+  }
+  private:
+  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
+  public:
+  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
+  bool IsInitialized() const final;
+
+  ::size_t ByteSizeLong() const final;
+  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
+  ::uint8_t* _InternalSerialize(
+      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
+
+  private:
+  void SharedCtor(::google::protobuf::Arena* arena);
+  void SharedDtor();
+  void SetCachedSize(int size) const final;
+  void InternalSwap(ListValue* other);
+
+  private:
+  friend class ::google::protobuf::internal::AnyMetadata;
+  static ::absl::string_view FullMessageName() {
+    return "google.protobuf.ListValue";
+  }
+  protected:
+  explicit ListValue(::google::protobuf::Arena* arena);
+  public:
+
+  static const ClassData _class_data_;
+  const ::google::protobuf::Message::ClassData*GetClassData() const final;
+
   ::google::protobuf::Metadata GetMetadata() const final;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  enum : int {
+    kValuesFieldNumber = 1,
+  };
+  // repeated .google.protobuf.Value values = 1;
+  int values_size() const;
+  private:
+  int _internal_values_size() const;
+
+  public:
+  void clear_values() ;
+  ::google::protobuf::Value* mutable_values(int index);
+  ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value >*
+      mutable_values();
+  private:
+  const ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>& _internal_values() const;
+  ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>* _internal_mutable_values();
+  public:
+  const ::google::protobuf::Value& values(int index) const;
+  ::google::protobuf::Value* add_values();
+  const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value >&
+      values() const;
+  // @@protoc_insertion_point(class_scope:google.protobuf.ListValue)
+ private:
+  class _Internal;
+
+  friend class ::google::protobuf::internal::TcParser;
+  static const ::google::protobuf::internal::TcParseTable<
+      0, 1, 1,
+      0, 2>
+      _table_;
+  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
+  typedef void InternalArenaConstructable_;
+  typedef void DestructorSkippable_;
+  struct Impl_ {
+    ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value > values_;
+    mutable ::google::protobuf::internal::CachedSize _cached_size_;
+    PROTOBUF_TSAN_DECLARE_MEMBER;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_google_2fprotobuf_2fstruct_2eproto;
-};
-// -------------------------------------------------------------------
+};// -------------------------------------------------------------------
 
 class PROTOBUF_EXPORT Struct final :
     public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Struct) */ {
@@ -309,6 +452,32 @@ class PROTOBUF_EXPORT Struct final :
   friend struct ::TableStruct_google_2fprotobuf_2fstruct_2eproto;
 };// -------------------------------------------------------------------
 
+class Struct_FieldsEntry_DoNotUse final : public ::google::protobuf::internal::MapEntry<Struct_FieldsEntry_DoNotUse, 
+    std::string, ::google::protobuf::Value,
+    ::google::protobuf::internal::WireFormatLite::TYPE_STRING,
+    ::google::protobuf::internal::WireFormatLite::TYPE_MESSAGE> {
+public:
+  typedef ::google::protobuf::internal::MapEntry<Struct_FieldsEntry_DoNotUse, 
+    std::string, ::google::protobuf::Value,
+    ::google::protobuf::internal::WireFormatLite::TYPE_STRING,
+    ::google::protobuf::internal::WireFormatLite::TYPE_MESSAGE> SuperType;
+  Struct_FieldsEntry_DoNotUse();
+  template <typename = void>
+  explicit PROTOBUF_CONSTEXPR Struct_FieldsEntry_DoNotUse(
+      ::google::protobuf::internal::ConstantInitialized);
+  explicit Struct_FieldsEntry_DoNotUse(::google::protobuf::Arena* arena);
+  void MergeFrom(const Struct_FieldsEntry_DoNotUse& other);
+  static const Struct_FieldsEntry_DoNotUse* internal_default_instance() { return reinterpret_cast<const Struct_FieldsEntry_DoNotUse*>(&_Struct_FieldsEntry_DoNotUse_default_instance_); }
+  static bool ValidateKey(std::string* s) {
+    return ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(s->data(), static_cast<int>(s->size()), ::google::protobuf::internal::WireFormatLite::PARSE, "google.protobuf.Struct.FieldsEntry.key");
+ }
+  static bool ValidateValue(void*) { return true; }
+  using ::google::protobuf::Message::MergeFrom;
+  ::google::protobuf::Metadata GetMetadata() const final;
+  friend struct ::TableStruct_google_2fprotobuf_2fstruct_2eproto;
+};
+// -------------------------------------------------------------------
+
 class PROTOBUF_EXPORT Value final :
     public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Value) */ {
  public:
@@ -583,175 +752,6 @@ class PROTOBUF_EXPORT Value final :
   };
   union { Impl_ _impl_; };
   friend struct ::TableStruct_google_2fprotobuf_2fstruct_2eproto;
-};// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT ListValue final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.ListValue) */ {
- public:
-  inline ListValue() : ListValue(nullptr) {}
-  ~ListValue() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ListValue(::google::protobuf::internal::ConstantInitialized);
-
-  ListValue(const ListValue& from);
-  ListValue(ListValue&& from) noexcept
-    : ListValue() {
-    *this = ::std::move(from);
-  }
-
-  inline ListValue& operator=(const ListValue& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ListValue& operator=(ListValue&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ListValue& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ListValue* internal_default_instance() {
-    return reinterpret_cast<const ListValue*>(
-               &_ListValue_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    3;
-
-  friend void swap(ListValue& a, ListValue& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ListValue* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ListValue* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ListValue* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ListValue>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ListValue& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ListValue& from) {
-    ListValue::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(ListValue* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "google.protobuf.ListValue";
-  }
-  protected:
-  explicit ListValue(::google::protobuf::Arena* arena);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kValuesFieldNumber = 1,
-  };
-  // repeated .google.protobuf.Value values = 1;
-  int values_size() const;
-  private:
-  int _internal_values_size() const;
-
-  public:
-  void clear_values() ;
-  ::google::protobuf::Value* mutable_values(int index);
-  ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value >*
-      mutable_values();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>& _internal_values() const;
-  ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>* _internal_mutable_values();
-  public:
-  const ::google::protobuf::Value& values(int index) const;
-  ::google::protobuf::Value* add_values();
-  const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value >&
-      values() const;
-  // @@protoc_insertion_point(class_scope:google.protobuf.ListValue)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 1,
-      0, 2>
-      _table_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value > values_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fstruct_2eproto;
 };
 
 // ===================================================================
diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc
index 034dabf2fa..d8486f1db3 100644
--- a/src/google/protobuf/type.pb.cc
+++ b/src/google/protobuf/type.pb.cc
@@ -23,34 +23,26 @@ namespace _fl = ::google::protobuf::internal::field_layout;
 namespace google {
 namespace protobuf {
         template <typename>
-PROTOBUF_CONSTEXPR Type::Type(::_pbi::ConstantInitialized)
+PROTOBUF_CONSTEXPR Option::Option(::_pbi::ConstantInitialized)
     : _impl_{
       /*decltype(_impl_._has_bits_)*/ {},
       /*decltype(_impl_._cached_size_)*/ {},
-      /*decltype(_impl_.fields_)*/ {},
-      /*decltype(_impl_.oneofs_)*/ {},
-      /*decltype(_impl_.options_)*/ {},
       /*decltype(_impl_.name_)*/ {
           &::_pbi::fixed_address_empty_string,
           ::_pbi::ConstantInitialized{},
       },
-      /*decltype(_impl_.edition_)*/ {
-          &::_pbi::fixed_address_empty_string,
-          ::_pbi::ConstantInitialized{},
-      },
-      /*decltype(_impl_.source_context_)*/ nullptr,
-      /*decltype(_impl_.syntax_)*/ 0,
+      /*decltype(_impl_.value_)*/ nullptr,
     } {}
-struct TypeDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR TypeDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~TypeDefaultTypeInternal() {}
+struct OptionDefaultTypeInternal {
+  PROTOBUF_CONSTEXPR OptionDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
+  ~OptionDefaultTypeInternal() {}
   union {
-    Type _instance;
+    Option _instance;
   };
 };
 
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 TypeDefaultTypeInternal _Type_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 OptionDefaultTypeInternal _Option_default_instance_;
         template <typename>
 PROTOBUF_CONSTEXPR Field::Field(::_pbi::ConstantInitialized)
     : _impl_{
@@ -89,75 +81,83 @@ struct FieldDefaultTypeInternal {
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
     PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FieldDefaultTypeInternal _Field_default_instance_;
         template <typename>
-PROTOBUF_CONSTEXPR Enum::Enum(::_pbi::ConstantInitialized)
+PROTOBUF_CONSTEXPR EnumValue::EnumValue(::_pbi::ConstantInitialized)
     : _impl_{
-      /*decltype(_impl_._has_bits_)*/ {},
-      /*decltype(_impl_._cached_size_)*/ {},
-      /*decltype(_impl_.enumvalue_)*/ {},
       /*decltype(_impl_.options_)*/ {},
       /*decltype(_impl_.name_)*/ {
           &::_pbi::fixed_address_empty_string,
           ::_pbi::ConstantInitialized{},
       },
-      /*decltype(_impl_.edition_)*/ {
-          &::_pbi::fixed_address_empty_string,
-          ::_pbi::ConstantInitialized{},
-      },
-      /*decltype(_impl_.source_context_)*/ nullptr,
-      /*decltype(_impl_.syntax_)*/ 0,
+      /*decltype(_impl_.number_)*/ 0,
+      /*decltype(_impl_._cached_size_)*/ {},
     } {}
-struct EnumDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR EnumDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~EnumDefaultTypeInternal() {}
+struct EnumValueDefaultTypeInternal {
+  PROTOBUF_CONSTEXPR EnumValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
+  ~EnumValueDefaultTypeInternal() {}
   union {
-    Enum _instance;
+    EnumValue _instance;
   };
 };
 
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EnumDefaultTypeInternal _Enum_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EnumValueDefaultTypeInternal _EnumValue_default_instance_;
         template <typename>
-PROTOBUF_CONSTEXPR EnumValue::EnumValue(::_pbi::ConstantInitialized)
+PROTOBUF_CONSTEXPR Type::Type(::_pbi::ConstantInitialized)
     : _impl_{
+      /*decltype(_impl_._has_bits_)*/ {},
+      /*decltype(_impl_._cached_size_)*/ {},
+      /*decltype(_impl_.fields_)*/ {},
+      /*decltype(_impl_.oneofs_)*/ {},
       /*decltype(_impl_.options_)*/ {},
       /*decltype(_impl_.name_)*/ {
           &::_pbi::fixed_address_empty_string,
           ::_pbi::ConstantInitialized{},
       },
-      /*decltype(_impl_.number_)*/ 0,
-      /*decltype(_impl_._cached_size_)*/ {},
+      /*decltype(_impl_.edition_)*/ {
+          &::_pbi::fixed_address_empty_string,
+          ::_pbi::ConstantInitialized{},
+      },
+      /*decltype(_impl_.source_context_)*/ nullptr,
+      /*decltype(_impl_.syntax_)*/ 0,
     } {}
-struct EnumValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR EnumValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~EnumValueDefaultTypeInternal() {}
+struct TypeDefaultTypeInternal {
+  PROTOBUF_CONSTEXPR TypeDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
+  ~TypeDefaultTypeInternal() {}
   union {
-    EnumValue _instance;
+    Type _instance;
   };
 };
 
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EnumValueDefaultTypeInternal _EnumValue_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 TypeDefaultTypeInternal _Type_default_instance_;
         template <typename>
-PROTOBUF_CONSTEXPR Option::Option(::_pbi::ConstantInitialized)
+PROTOBUF_CONSTEXPR Enum::Enum(::_pbi::ConstantInitialized)
     : _impl_{
       /*decltype(_impl_._has_bits_)*/ {},
       /*decltype(_impl_._cached_size_)*/ {},
+      /*decltype(_impl_.enumvalue_)*/ {},
+      /*decltype(_impl_.options_)*/ {},
       /*decltype(_impl_.name_)*/ {
           &::_pbi::fixed_address_empty_string,
           ::_pbi::ConstantInitialized{},
       },
-      /*decltype(_impl_.value_)*/ nullptr,
+      /*decltype(_impl_.edition_)*/ {
+          &::_pbi::fixed_address_empty_string,
+          ::_pbi::ConstantInitialized{},
+      },
+      /*decltype(_impl_.source_context_)*/ nullptr,
+      /*decltype(_impl_.syntax_)*/ 0,
     } {}
-struct OptionDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR OptionDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~OptionDefaultTypeInternal() {}
+struct EnumDefaultTypeInternal {
+  PROTOBUF_CONSTEXPR EnumDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
+  ~EnumDefaultTypeInternal() {}
   union {
-    Option _instance;
+    Enum _instance;
   };
 };
 
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 OptionDefaultTypeInternal _Option_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EnumDefaultTypeInternal _Enum_default_instance_;
 }  // namespace protobuf
 }  // namespace google
 static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2ftype_2eproto[5];
diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h
index 28d87dd824..86d890aa53 100644
--- a/src/google/protobuf/type.pb.h
+++ b/src/google/protobuf/type.pb.h
@@ -200,25 +200,25 @@ inline bool Syntax_Parse(absl::string_view name, Syntax* value) {
 
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Type final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Type) */ {
+class PROTOBUF_EXPORT Option final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Option) */ {
  public:
-  inline Type() : Type(nullptr) {}
-  ~Type() override;
+  inline Option() : Option(nullptr) {}
+  ~Option() override;
   template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Type(::google::protobuf::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR Option(::google::protobuf::internal::ConstantInitialized);
 
-  Type(const Type& from);
-  Type(Type&& from) noexcept
-    : Type() {
+  Option(const Option& from);
+  Option(Option&& from) noexcept
+    : Option() {
     *this = ::std::move(from);
   }
 
-  inline Type& operator=(const Type& from) {
+  inline Option& operator=(const Option& from) {
     CopyFrom(from);
     return *this;
   }
-  inline Type& operator=(Type&& from) noexcept {
+  inline Option& operator=(Option&& from) noexcept {
     if (this == &from) return *this;
     if (GetOwningArena() == from.GetOwningArena()
   #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
@@ -248,20 +248,20 @@ class PROTOBUF_EXPORT Type final :
   static const ::google::protobuf::Reflection* GetReflection() {
     return default_instance().GetMetadata().reflection;
   }
-  static const Type& default_instance() {
+  static const Option& default_instance() {
     return *internal_default_instance();
   }
-  static inline const Type* internal_default_instance() {
-    return reinterpret_cast<const Type*>(
-               &_Type_default_instance_);
+  static inline const Option* internal_default_instance() {
+    return reinterpret_cast<const Option*>(
+               &_Option_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    0;
+    4;
 
-  friend void swap(Type& a, Type& b) {
+  friend void swap(Option& a, Option& b) {
     a.Swap(&b);
   }
-  inline void Swap(Type* other) {
+  inline void Swap(Option* other) {
     if (other == this) return;
   #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetOwningArena() != nullptr &&
@@ -274,7 +274,7 @@ class PROTOBUF_EXPORT Type final :
       ::google::protobuf::internal::GenericSwap(this, other);
     }
   }
-  void UnsafeArenaSwap(Type* other) {
+  void UnsafeArenaSwap(Option* other) {
     if (other == this) return;
     ABSL_DCHECK(GetOwningArena() == other->GetOwningArena());
     InternalSwap(other);
@@ -282,14 +282,14 @@ class PROTOBUF_EXPORT Type final :
 
   // implements Message ----------------------------------------------
 
-  Type* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Type>(arena);
+  Option* New(::google::protobuf::Arena* arena = nullptr) const final {
+    return CreateMaybeMessage<Option>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const Type& from);
+  void CopyFrom(const Option& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Type& from) {
-    Type::MergeImpl(*this, from);
+  void MergeFrom( const Option& from) {
+    Option::MergeImpl(*this, from);
   }
   private:
   static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
@@ -307,15 +307,15 @@ class PROTOBUF_EXPORT Type final :
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void SetCachedSize(int size) const final;
-  void InternalSwap(Type* other);
+  void InternalSwap(Option* other);
 
   private:
   friend class ::google::protobuf::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "google.protobuf.Type";
+    return "google.protobuf.Option";
   }
   protected:
-  explicit Type(::google::protobuf::Arena* arena);
+  explicit Option(::google::protobuf::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -328,78 +328,9 @@ class PROTOBUF_EXPORT Type final :
   // accessors -------------------------------------------------------
 
   enum : int {
-    kFieldsFieldNumber = 2,
-    kOneofsFieldNumber = 3,
-    kOptionsFieldNumber = 4,
     kNameFieldNumber = 1,
-    kEditionFieldNumber = 7,
-    kSourceContextFieldNumber = 5,
-    kSyntaxFieldNumber = 6,
+    kValueFieldNumber = 2,
   };
-  // repeated .google.protobuf.Field fields = 2;
-  int fields_size() const;
-  private:
-  int _internal_fields_size() const;
-
-  public:
-  void clear_fields() ;
-  ::google::protobuf::Field* mutable_fields(int index);
-  ::google::protobuf::RepeatedPtrField< ::google::protobuf::Field >*
-      mutable_fields();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::google::protobuf::Field>& _internal_fields() const;
-  ::google::protobuf::RepeatedPtrField<::google::protobuf::Field>* _internal_mutable_fields();
-  public:
-  const ::google::protobuf::Field& fields(int index) const;
-  ::google::protobuf::Field* add_fields();
-  const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Field >&
-      fields() const;
-  // repeated string oneofs = 3;
-  int oneofs_size() const;
-  private:
-  int _internal_oneofs_size() const;
-
-  public:
-  void clear_oneofs() ;
-  const std::string& oneofs(int index) const;
-  std::string* mutable_oneofs(int index);
-  void set_oneofs(int index, const std::string& value);
-  void set_oneofs(int index, std::string&& value);
-  void set_oneofs(int index, const char* value);
-  void set_oneofs(int index, const char* value, std::size_t size);
-  void set_oneofs(int index, absl::string_view value);
-  std::string* add_oneofs();
-  void add_oneofs(const std::string& value);
-  void add_oneofs(std::string&& value);
-  void add_oneofs(const char* value);
-  void add_oneofs(const char* value, std::size_t size);
-  void add_oneofs(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& oneofs() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_oneofs();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_oneofs() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_oneofs();
-
-  public:
-  // repeated .google.protobuf.Option options = 4;
-  int options_size() const;
-  private:
-  int _internal_options_size() const;
-
-  public:
-  void clear_options() ;
-  ::google::protobuf::Option* mutable_options(int index);
-  ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >*
-      mutable_options();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>& _internal_options() const;
-  ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* _internal_mutable_options();
-  public:
-  const ::google::protobuf::Option& options(int index) const;
-  ::google::protobuf::Option* add_options();
-  const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >&
-      options() const;
   // string name = 1;
   void clear_name() ;
   const std::string& name() const;
@@ -416,55 +347,29 @@ class PROTOBUF_EXPORT Type final :
   std::string* _internal_mutable_name();
 
   public:
-  // string edition = 7;
-  void clear_edition() ;
-  const std::string& edition() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_edition(Arg_&& arg, Args_... args);
-  std::string* mutable_edition();
-  PROTOBUF_NODISCARD std::string* release_edition();
-  void set_allocated_edition(std::string* ptr);
-
-  private:
-  const std::string& _internal_edition() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_edition(
-      const std::string& value);
-  std::string* _internal_mutable_edition();
-
-  public:
-  // .google.protobuf.SourceContext source_context = 5;
-  bool has_source_context() const;
-  void clear_source_context() ;
-  const ::google::protobuf::SourceContext& source_context() const;
-  PROTOBUF_NODISCARD ::google::protobuf::SourceContext* release_source_context();
-  ::google::protobuf::SourceContext* mutable_source_context();
-  void set_allocated_source_context(::google::protobuf::SourceContext* value);
-  void unsafe_arena_set_allocated_source_context(::google::protobuf::SourceContext* value);
-  ::google::protobuf::SourceContext* unsafe_arena_release_source_context();
-
-  private:
-  const ::google::protobuf::SourceContext& _internal_source_context() const;
-  ::google::protobuf::SourceContext* _internal_mutable_source_context();
-
-  public:
-  // .google.protobuf.Syntax syntax = 6;
-  void clear_syntax() ;
-  ::google::protobuf::Syntax syntax() const;
-  void set_syntax(::google::protobuf::Syntax value);
+  // .google.protobuf.Any value = 2;
+  bool has_value() const;
+  void clear_value() ;
+  const ::google::protobuf::Any& value() const;
+  PROTOBUF_NODISCARD ::google::protobuf::Any* release_value();
+  ::google::protobuf::Any* mutable_value();
+  void set_allocated_value(::google::protobuf::Any* value);
+  void unsafe_arena_set_allocated_value(::google::protobuf::Any* value);
+  ::google::protobuf::Any* unsafe_arena_release_value();
 
   private:
-  ::google::protobuf::Syntax _internal_syntax() const;
-  void _internal_set_syntax(::google::protobuf::Syntax value);
+  const ::google::protobuf::Any& _internal_value() const;
+  ::google::protobuf::Any* _internal_mutable_value();
 
   public:
-  // @@protoc_insertion_point(class_scope:google.protobuf.Type)
+  // @@protoc_insertion_point(class_scope:google.protobuf.Option)
  private:
   class _Internal;
 
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
-      3, 7, 3,
-      46, 2>
+      1, 2, 1,
+      35, 2>
       _table_;
   template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
@@ -472,13 +377,8 @@ class PROTOBUF_EXPORT Type final :
   struct Impl_ {
     ::google::protobuf::internal::HasBits<1> _has_bits_;
     mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::google::protobuf::Field > fields_;
-    ::google::protobuf::RepeatedPtrField<std::string> oneofs_;
-    ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option > options_;
     ::google::protobuf::internal::ArenaStringPtr name_;
-    ::google::protobuf::internal::ArenaStringPtr edition_;
-    ::google::protobuf::SourceContext* source_context_;
-    int syntax_;
+    ::google::protobuf::Any* value_;
     PROTOBUF_TSAN_DECLARE_MEMBER;
   };
   union { Impl_ _impl_; };
@@ -845,25 +745,25 @@ class PROTOBUF_EXPORT Field final :
   friend struct ::TableStruct_google_2fprotobuf_2ftype_2eproto;
 };// -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Enum final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Enum) */ {
+class PROTOBUF_EXPORT EnumValue final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.EnumValue) */ {
  public:
-  inline Enum() : Enum(nullptr) {}
-  ~Enum() override;
+  inline EnumValue() : EnumValue(nullptr) {}
+  ~EnumValue() override;
   template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Enum(::google::protobuf::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR EnumValue(::google::protobuf::internal::ConstantInitialized);
 
-  Enum(const Enum& from);
-  Enum(Enum&& from) noexcept
-    : Enum() {
+  EnumValue(const EnumValue& from);
+  EnumValue(EnumValue&& from) noexcept
+    : EnumValue() {
     *this = ::std::move(from);
   }
 
-  inline Enum& operator=(const Enum& from) {
+  inline EnumValue& operator=(const EnumValue& from) {
     CopyFrom(from);
     return *this;
   }
-  inline Enum& operator=(Enum&& from) noexcept {
+  inline EnumValue& operator=(EnumValue&& from) noexcept {
     if (this == &from) return *this;
     if (GetOwningArena() == from.GetOwningArena()
   #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
@@ -893,20 +793,20 @@ class PROTOBUF_EXPORT Enum final :
   static const ::google::protobuf::Reflection* GetReflection() {
     return default_instance().GetMetadata().reflection;
   }
-  static const Enum& default_instance() {
+  static const EnumValue& default_instance() {
     return *internal_default_instance();
   }
-  static inline const Enum* internal_default_instance() {
-    return reinterpret_cast<const Enum*>(
-               &_Enum_default_instance_);
+  static inline const EnumValue* internal_default_instance() {
+    return reinterpret_cast<const EnumValue*>(
+               &_EnumValue_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    2;
+    3;
 
-  friend void swap(Enum& a, Enum& b) {
+  friend void swap(EnumValue& a, EnumValue& b) {
     a.Swap(&b);
   }
-  inline void Swap(Enum* other) {
+  inline void Swap(EnumValue* other) {
     if (other == this) return;
   #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetOwningArena() != nullptr &&
@@ -919,7 +819,7 @@ class PROTOBUF_EXPORT Enum final :
       ::google::protobuf::internal::GenericSwap(this, other);
     }
   }
-  void UnsafeArenaSwap(Enum* other) {
+  void UnsafeArenaSwap(EnumValue* other) {
     if (other == this) return;
     ABSL_DCHECK(GetOwningArena() == other->GetOwningArena());
     InternalSwap(other);
@@ -927,14 +827,14 @@ class PROTOBUF_EXPORT Enum final :
 
   // implements Message ----------------------------------------------
 
-  Enum* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Enum>(arena);
+  EnumValue* New(::google::protobuf::Arena* arena = nullptr) const final {
+    return CreateMaybeMessage<EnumValue>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const Enum& from);
+  void CopyFrom(const EnumValue& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Enum& from) {
-    Enum::MergeImpl(*this, from);
+  void MergeFrom( const EnumValue& from) {
+    EnumValue::MergeImpl(*this, from);
   }
   private:
   static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
@@ -952,15 +852,15 @@ class PROTOBUF_EXPORT Enum final :
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void SetCachedSize(int size) const final;
-  void InternalSwap(Enum* other);
+  void InternalSwap(EnumValue* other);
 
   private:
   friend class ::google::protobuf::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "google.protobuf.Enum";
+    return "google.protobuf.EnumValue";
   }
   protected:
-  explicit Enum(::google::protobuf::Arena* arena);
+  explicit EnumValue(::google::protobuf::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -973,41 +873,20 @@ class PROTOBUF_EXPORT Enum final :
   // accessors -------------------------------------------------------
 
   enum : int {
-    kEnumvalueFieldNumber = 2,
     kOptionsFieldNumber = 3,
     kNameFieldNumber = 1,
-    kEditionFieldNumber = 6,
-    kSourceContextFieldNumber = 4,
-    kSyntaxFieldNumber = 5,
+    kNumberFieldNumber = 2,
   };
-  // repeated .google.protobuf.EnumValue enumvalue = 2;
-  int enumvalue_size() const;
+  // repeated .google.protobuf.Option options = 3;
+  int options_size() const;
   private:
-  int _internal_enumvalue_size() const;
+  int _internal_options_size() const;
 
   public:
-  void clear_enumvalue() ;
-  ::google::protobuf::EnumValue* mutable_enumvalue(int index);
-  ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValue >*
-      mutable_enumvalue();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumValue>& _internal_enumvalue() const;
-  ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumValue>* _internal_mutable_enumvalue();
-  public:
-  const ::google::protobuf::EnumValue& enumvalue(int index) const;
-  ::google::protobuf::EnumValue* add_enumvalue();
-  const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValue >&
-      enumvalue() const;
-  // repeated .google.protobuf.Option options = 3;
-  int options_size() const;
-  private:
-  int _internal_options_size() const;
-
-  public:
-  void clear_options() ;
-  ::google::protobuf::Option* mutable_options(int index);
-  ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >*
-      mutable_options();
+  void clear_options() ;
+  ::google::protobuf::Option* mutable_options(int index);
+  ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >*
+      mutable_options();
   private:
   const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>& _internal_options() const;
   ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* _internal_mutable_options();
@@ -1032,93 +911,58 @@ class PROTOBUF_EXPORT Enum final :
   std::string* _internal_mutable_name();
 
   public:
-  // string edition = 6;
-  void clear_edition() ;
-  const std::string& edition() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_edition(Arg_&& arg, Args_... args);
-  std::string* mutable_edition();
-  PROTOBUF_NODISCARD std::string* release_edition();
-  void set_allocated_edition(std::string* ptr);
-
-  private:
-  const std::string& _internal_edition() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_edition(
-      const std::string& value);
-  std::string* _internal_mutable_edition();
-
-  public:
-  // .google.protobuf.SourceContext source_context = 4;
-  bool has_source_context() const;
-  void clear_source_context() ;
-  const ::google::protobuf::SourceContext& source_context() const;
-  PROTOBUF_NODISCARD ::google::protobuf::SourceContext* release_source_context();
-  ::google::protobuf::SourceContext* mutable_source_context();
-  void set_allocated_source_context(::google::protobuf::SourceContext* value);
-  void unsafe_arena_set_allocated_source_context(::google::protobuf::SourceContext* value);
-  ::google::protobuf::SourceContext* unsafe_arena_release_source_context();
-
-  private:
-  const ::google::protobuf::SourceContext& _internal_source_context() const;
-  ::google::protobuf::SourceContext* _internal_mutable_source_context();
-
-  public:
-  // .google.protobuf.Syntax syntax = 5;
-  void clear_syntax() ;
-  ::google::protobuf::Syntax syntax() const;
-  void set_syntax(::google::protobuf::Syntax value);
+  // int32 number = 2;
+  void clear_number() ;
+  ::int32_t number() const;
+  void set_number(::int32_t value);
 
   private:
-  ::google::protobuf::Syntax _internal_syntax() const;
-  void _internal_set_syntax(::google::protobuf::Syntax value);
+  ::int32_t _internal_number() const;
+  void _internal_set_number(::int32_t value);
 
   public:
-  // @@protoc_insertion_point(class_scope:google.protobuf.Enum)
+  // @@protoc_insertion_point(class_scope:google.protobuf.EnumValue)
  private:
   class _Internal;
 
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
-      3, 6, 3,
-      40, 2>
+      2, 3, 1,
+      38, 2>
       _table_;
   template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
   struct Impl_ {
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValue > enumvalue_;
     ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option > options_;
     ::google::protobuf::internal::ArenaStringPtr name_;
-    ::google::protobuf::internal::ArenaStringPtr edition_;
-    ::google::protobuf::SourceContext* source_context_;
-    int syntax_;
+    ::int32_t number_;
+    mutable ::google::protobuf::internal::CachedSize _cached_size_;
     PROTOBUF_TSAN_DECLARE_MEMBER;
   };
   union { Impl_ _impl_; };
   friend struct ::TableStruct_google_2fprotobuf_2ftype_2eproto;
 };// -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT EnumValue final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.EnumValue) */ {
+class PROTOBUF_EXPORT Type final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Type) */ {
  public:
-  inline EnumValue() : EnumValue(nullptr) {}
-  ~EnumValue() override;
+  inline Type() : Type(nullptr) {}
+  ~Type() override;
   template<typename = void>
-  explicit PROTOBUF_CONSTEXPR EnumValue(::google::protobuf::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR Type(::google::protobuf::internal::ConstantInitialized);
 
-  EnumValue(const EnumValue& from);
-  EnumValue(EnumValue&& from) noexcept
-    : EnumValue() {
+  Type(const Type& from);
+  Type(Type&& from) noexcept
+    : Type() {
     *this = ::std::move(from);
   }
 
-  inline EnumValue& operator=(const EnumValue& from) {
+  inline Type& operator=(const Type& from) {
     CopyFrom(from);
     return *this;
   }
-  inline EnumValue& operator=(EnumValue&& from) noexcept {
+  inline Type& operator=(Type&& from) noexcept {
     if (this == &from) return *this;
     if (GetOwningArena() == from.GetOwningArena()
   #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
@@ -1148,20 +992,20 @@ class PROTOBUF_EXPORT EnumValue final :
   static const ::google::protobuf::Reflection* GetReflection() {
     return default_instance().GetMetadata().reflection;
   }
-  static const EnumValue& default_instance() {
+  static const Type& default_instance() {
     return *internal_default_instance();
   }
-  static inline const EnumValue* internal_default_instance() {
-    return reinterpret_cast<const EnumValue*>(
-               &_EnumValue_default_instance_);
+  static inline const Type* internal_default_instance() {
+    return reinterpret_cast<const Type*>(
+               &_Type_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    3;
+    0;
 
-  friend void swap(EnumValue& a, EnumValue& b) {
+  friend void swap(Type& a, Type& b) {
     a.Swap(&b);
   }
-  inline void Swap(EnumValue* other) {
+  inline void Swap(Type* other) {
     if (other == this) return;
   #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetOwningArena() != nullptr &&
@@ -1174,7 +1018,7 @@ class PROTOBUF_EXPORT EnumValue final :
       ::google::protobuf::internal::GenericSwap(this, other);
     }
   }
-  void UnsafeArenaSwap(EnumValue* other) {
+  void UnsafeArenaSwap(Type* other) {
     if (other == this) return;
     ABSL_DCHECK(GetOwningArena() == other->GetOwningArena());
     InternalSwap(other);
@@ -1182,14 +1026,14 @@ class PROTOBUF_EXPORT EnumValue final :
 
   // implements Message ----------------------------------------------
 
-  EnumValue* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<EnumValue>(arena);
+  Type* New(::google::protobuf::Arena* arena = nullptr) const final {
+    return CreateMaybeMessage<Type>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const EnumValue& from);
+  void CopyFrom(const Type& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const EnumValue& from) {
-    EnumValue::MergeImpl(*this, from);
+  void MergeFrom( const Type& from) {
+    Type::MergeImpl(*this, from);
   }
   private:
   static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
@@ -1207,15 +1051,15 @@ class PROTOBUF_EXPORT EnumValue final :
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void SetCachedSize(int size) const final;
-  void InternalSwap(EnumValue* other);
+  void InternalSwap(Type* other);
 
   private:
   friend class ::google::protobuf::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "google.protobuf.EnumValue";
+    return "google.protobuf.Type";
   }
   protected:
-  explicit EnumValue(::google::protobuf::Arena* arena);
+  explicit Type(::google::protobuf::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -1228,11 +1072,61 @@ class PROTOBUF_EXPORT EnumValue final :
   // accessors -------------------------------------------------------
 
   enum : int {
-    kOptionsFieldNumber = 3,
+    kFieldsFieldNumber = 2,
+    kOneofsFieldNumber = 3,
+    kOptionsFieldNumber = 4,
     kNameFieldNumber = 1,
-    kNumberFieldNumber = 2,
+    kEditionFieldNumber = 7,
+    kSourceContextFieldNumber = 5,
+    kSyntaxFieldNumber = 6,
   };
-  // repeated .google.protobuf.Option options = 3;
+  // repeated .google.protobuf.Field fields = 2;
+  int fields_size() const;
+  private:
+  int _internal_fields_size() const;
+
+  public:
+  void clear_fields() ;
+  ::google::protobuf::Field* mutable_fields(int index);
+  ::google::protobuf::RepeatedPtrField< ::google::protobuf::Field >*
+      mutable_fields();
+  private:
+  const ::google::protobuf::RepeatedPtrField<::google::protobuf::Field>& _internal_fields() const;
+  ::google::protobuf::RepeatedPtrField<::google::protobuf::Field>* _internal_mutable_fields();
+  public:
+  const ::google::protobuf::Field& fields(int index) const;
+  ::google::protobuf::Field* add_fields();
+  const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Field >&
+      fields() const;
+  // repeated string oneofs = 3;
+  int oneofs_size() const;
+  private:
+  int _internal_oneofs_size() const;
+
+  public:
+  void clear_oneofs() ;
+  const std::string& oneofs(int index) const;
+  std::string* mutable_oneofs(int index);
+  void set_oneofs(int index, const std::string& value);
+  void set_oneofs(int index, std::string&& value);
+  void set_oneofs(int index, const char* value);
+  void set_oneofs(int index, const char* value, std::size_t size);
+  void set_oneofs(int index, absl::string_view value);
+  std::string* add_oneofs();
+  void add_oneofs(const std::string& value);
+  void add_oneofs(std::string&& value);
+  void add_oneofs(const char* value);
+  void add_oneofs(const char* value, std::size_t size);
+  void add_oneofs(absl::string_view value);
+  const ::google::protobuf::RepeatedPtrField<std::string>& oneofs() const;
+  ::google::protobuf::RepeatedPtrField<std::string>* mutable_oneofs();
+
+  private:
+  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_oneofs() const;
+  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_oneofs();
+
+  public:
+  // repeated .google.protobuf.Option options = 4;
   int options_size() const;
   private:
   int _internal_options_size() const;
@@ -1266,58 +1160,94 @@ class PROTOBUF_EXPORT EnumValue final :
   std::string* _internal_mutable_name();
 
   public:
-  // int32 number = 2;
-  void clear_number() ;
-  ::int32_t number() const;
-  void set_number(::int32_t value);
+  // string edition = 7;
+  void clear_edition() ;
+  const std::string& edition() const;
+  template <typename Arg_ = const std::string&, typename... Args_>
+  void set_edition(Arg_&& arg, Args_... args);
+  std::string* mutable_edition();
+  PROTOBUF_NODISCARD std::string* release_edition();
+  void set_allocated_edition(std::string* ptr);
 
   private:
-  ::int32_t _internal_number() const;
-  void _internal_set_number(::int32_t value);
+  const std::string& _internal_edition() const;
+  inline PROTOBUF_ALWAYS_INLINE void _internal_set_edition(
+      const std::string& value);
+  std::string* _internal_mutable_edition();
 
   public:
-  // @@protoc_insertion_point(class_scope:google.protobuf.EnumValue)
+  // .google.protobuf.SourceContext source_context = 5;
+  bool has_source_context() const;
+  void clear_source_context() ;
+  const ::google::protobuf::SourceContext& source_context() const;
+  PROTOBUF_NODISCARD ::google::protobuf::SourceContext* release_source_context();
+  ::google::protobuf::SourceContext* mutable_source_context();
+  void set_allocated_source_context(::google::protobuf::SourceContext* value);
+  void unsafe_arena_set_allocated_source_context(::google::protobuf::SourceContext* value);
+  ::google::protobuf::SourceContext* unsafe_arena_release_source_context();
+
+  private:
+  const ::google::protobuf::SourceContext& _internal_source_context() const;
+  ::google::protobuf::SourceContext* _internal_mutable_source_context();
+
+  public:
+  // .google.protobuf.Syntax syntax = 6;
+  void clear_syntax() ;
+  ::google::protobuf::Syntax syntax() const;
+  void set_syntax(::google::protobuf::Syntax value);
+
+  private:
+  ::google::protobuf::Syntax _internal_syntax() const;
+  void _internal_set_syntax(::google::protobuf::Syntax value);
+
+  public:
+  // @@protoc_insertion_point(class_scope:google.protobuf.Type)
  private:
   class _Internal;
 
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 1,
-      38, 2>
+      3, 7, 3,
+      46, 2>
       _table_;
   template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
   struct Impl_ {
+    ::google::protobuf::internal::HasBits<1> _has_bits_;
+    mutable ::google::protobuf::internal::CachedSize _cached_size_;
+    ::google::protobuf::RepeatedPtrField< ::google::protobuf::Field > fields_;
+    ::google::protobuf::RepeatedPtrField<std::string> oneofs_;
     ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option > options_;
     ::google::protobuf::internal::ArenaStringPtr name_;
-    ::int32_t number_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
+    ::google::protobuf::internal::ArenaStringPtr edition_;
+    ::google::protobuf::SourceContext* source_context_;
+    int syntax_;
     PROTOBUF_TSAN_DECLARE_MEMBER;
   };
   union { Impl_ _impl_; };
   friend struct ::TableStruct_google_2fprotobuf_2ftype_2eproto;
 };// -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Option final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Option) */ {
+class PROTOBUF_EXPORT Enum final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Enum) */ {
  public:
-  inline Option() : Option(nullptr) {}
-  ~Option() override;
+  inline Enum() : Enum(nullptr) {}
+  ~Enum() override;
   template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Option(::google::protobuf::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR Enum(::google::protobuf::internal::ConstantInitialized);
 
-  Option(const Option& from);
-  Option(Option&& from) noexcept
-    : Option() {
+  Enum(const Enum& from);
+  Enum(Enum&& from) noexcept
+    : Enum() {
     *this = ::std::move(from);
   }
 
-  inline Option& operator=(const Option& from) {
+  inline Enum& operator=(const Enum& from) {
     CopyFrom(from);
     return *this;
   }
-  inline Option& operator=(Option&& from) noexcept {
+  inline Enum& operator=(Enum&& from) noexcept {
     if (this == &from) return *this;
     if (GetOwningArena() == from.GetOwningArena()
   #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
@@ -1347,20 +1277,20 @@ class PROTOBUF_EXPORT Option final :
   static const ::google::protobuf::Reflection* GetReflection() {
     return default_instance().GetMetadata().reflection;
   }
-  static const Option& default_instance() {
+  static const Enum& default_instance() {
     return *internal_default_instance();
   }
-  static inline const Option* internal_default_instance() {
-    return reinterpret_cast<const Option*>(
-               &_Option_default_instance_);
+  static inline const Enum* internal_default_instance() {
+    return reinterpret_cast<const Enum*>(
+               &_Enum_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    4;
+    2;
 
-  friend void swap(Option& a, Option& b) {
+  friend void swap(Enum& a, Enum& b) {
     a.Swap(&b);
   }
-  inline void Swap(Option* other) {
+  inline void Swap(Enum* other) {
     if (other == this) return;
   #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetOwningArena() != nullptr &&
@@ -1373,7 +1303,7 @@ class PROTOBUF_EXPORT Option final :
       ::google::protobuf::internal::GenericSwap(this, other);
     }
   }
-  void UnsafeArenaSwap(Option* other) {
+  void UnsafeArenaSwap(Enum* other) {
     if (other == this) return;
     ABSL_DCHECK(GetOwningArena() == other->GetOwningArena());
     InternalSwap(other);
@@ -1381,14 +1311,14 @@ class PROTOBUF_EXPORT Option final :
 
   // implements Message ----------------------------------------------
 
-  Option* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Option>(arena);
+  Enum* New(::google::protobuf::Arena* arena = nullptr) const final {
+    return CreateMaybeMessage<Enum>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const Option& from);
+  void CopyFrom(const Enum& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Option& from) {
-    Option::MergeImpl(*this, from);
+  void MergeFrom( const Enum& from) {
+    Enum::MergeImpl(*this, from);
   }
   private:
   static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
@@ -1406,15 +1336,15 @@ class PROTOBUF_EXPORT Option final :
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void SetCachedSize(int size) const final;
-  void InternalSwap(Option* other);
+  void InternalSwap(Enum* other);
 
   private:
   friend class ::google::protobuf::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "google.protobuf.Option";
+    return "google.protobuf.Enum";
   }
   protected:
-  explicit Option(::google::protobuf::Arena* arena);
+  explicit Enum(::google::protobuf::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -1427,9 +1357,49 @@ class PROTOBUF_EXPORT Option final :
   // accessors -------------------------------------------------------
 
   enum : int {
+    kEnumvalueFieldNumber = 2,
+    kOptionsFieldNumber = 3,
     kNameFieldNumber = 1,
-    kValueFieldNumber = 2,
+    kEditionFieldNumber = 6,
+    kSourceContextFieldNumber = 4,
+    kSyntaxFieldNumber = 5,
   };
+  // repeated .google.protobuf.EnumValue enumvalue = 2;
+  int enumvalue_size() const;
+  private:
+  int _internal_enumvalue_size() const;
+
+  public:
+  void clear_enumvalue() ;
+  ::google::protobuf::EnumValue* mutable_enumvalue(int index);
+  ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValue >*
+      mutable_enumvalue();
+  private:
+  const ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumValue>& _internal_enumvalue() const;
+  ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumValue>* _internal_mutable_enumvalue();
+  public:
+  const ::google::protobuf::EnumValue& enumvalue(int index) const;
+  ::google::protobuf::EnumValue* add_enumvalue();
+  const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValue >&
+      enumvalue() const;
+  // repeated .google.protobuf.Option options = 3;
+  int options_size() const;
+  private:
+  int _internal_options_size() const;
+
+  public:
+  void clear_options() ;
+  ::google::protobuf::Option* mutable_options(int index);
+  ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >*
+      mutable_options();
+  private:
+  const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>& _internal_options() const;
+  ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* _internal_mutable_options();
+  public:
+  const ::google::protobuf::Option& options(int index) const;
+  ::google::protobuf::Option* add_options();
+  const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >&
+      options() const;
   // string name = 1;
   void clear_name() ;
   const std::string& name() const;
@@ -1446,29 +1416,55 @@ class PROTOBUF_EXPORT Option final :
   std::string* _internal_mutable_name();
 
   public:
-  // .google.protobuf.Any value = 2;
-  bool has_value() const;
-  void clear_value() ;
-  const ::google::protobuf::Any& value() const;
-  PROTOBUF_NODISCARD ::google::protobuf::Any* release_value();
-  ::google::protobuf::Any* mutable_value();
-  void set_allocated_value(::google::protobuf::Any* value);
-  void unsafe_arena_set_allocated_value(::google::protobuf::Any* value);
-  ::google::protobuf::Any* unsafe_arena_release_value();
+  // string edition = 6;
+  void clear_edition() ;
+  const std::string& edition() const;
+  template <typename Arg_ = const std::string&, typename... Args_>
+  void set_edition(Arg_&& arg, Args_... args);
+  std::string* mutable_edition();
+  PROTOBUF_NODISCARD std::string* release_edition();
+  void set_allocated_edition(std::string* ptr);
 
   private:
-  const ::google::protobuf::Any& _internal_value() const;
-  ::google::protobuf::Any* _internal_mutable_value();
+  const std::string& _internal_edition() const;
+  inline PROTOBUF_ALWAYS_INLINE void _internal_set_edition(
+      const std::string& value);
+  std::string* _internal_mutable_edition();
 
   public:
-  // @@protoc_insertion_point(class_scope:google.protobuf.Option)
+  // .google.protobuf.SourceContext source_context = 4;
+  bool has_source_context() const;
+  void clear_source_context() ;
+  const ::google::protobuf::SourceContext& source_context() const;
+  PROTOBUF_NODISCARD ::google::protobuf::SourceContext* release_source_context();
+  ::google::protobuf::SourceContext* mutable_source_context();
+  void set_allocated_source_context(::google::protobuf::SourceContext* value);
+  void unsafe_arena_set_allocated_source_context(::google::protobuf::SourceContext* value);
+  ::google::protobuf::SourceContext* unsafe_arena_release_source_context();
+
+  private:
+  const ::google::protobuf::SourceContext& _internal_source_context() const;
+  ::google::protobuf::SourceContext* _internal_mutable_source_context();
+
+  public:
+  // .google.protobuf.Syntax syntax = 5;
+  void clear_syntax() ;
+  ::google::protobuf::Syntax syntax() const;
+  void set_syntax(::google::protobuf::Syntax value);
+
+  private:
+  ::google::protobuf::Syntax _internal_syntax() const;
+  void _internal_set_syntax(::google::protobuf::Syntax value);
+
+  public:
+  // @@protoc_insertion_point(class_scope:google.protobuf.Enum)
  private:
   class _Internal;
 
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 1,
-      35, 2>
+      3, 6, 3,
+      40, 2>
       _table_;
   template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
@@ -1476,8 +1472,12 @@ class PROTOBUF_EXPORT Option final :
   struct Impl_ {
     ::google::protobuf::internal::HasBits<1> _has_bits_;
     mutable ::google::protobuf::internal::CachedSize _cached_size_;
+    ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValue > enumvalue_;
+    ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option > options_;
     ::google::protobuf::internal::ArenaStringPtr name_;
-    ::google::protobuf::Any* value_;
+    ::google::protobuf::internal::ArenaStringPtr edition_;
+    ::google::protobuf::SourceContext* source_context_;
+    int syntax_;
     PROTOBUF_TSAN_DECLARE_MEMBER;
   };
   union { Impl_ _impl_; };
diff --git a/src/google/protobuf/wrappers.pb.cc b/src/google/protobuf/wrappers.pb.cc
index 084608e8c4..e447919516 100644
--- a/src/google/protobuf/wrappers.pb.cc
+++ b/src/google/protobuf/wrappers.pb.cc
@@ -23,69 +23,72 @@ namespace _fl = ::google::protobuf::internal::field_layout;
 namespace google {
 namespace protobuf {
         template <typename>
-PROTOBUF_CONSTEXPR DoubleValue::DoubleValue(::_pbi::ConstantInitialized)
+PROTOBUF_CONSTEXPR UInt64Value::UInt64Value(::_pbi::ConstantInitialized)
     : _impl_{
-      /*decltype(_impl_.value_)*/ 0,
+      /*decltype(_impl_.value_)*/ ::uint64_t{0u},
       /*decltype(_impl_._cached_size_)*/ {},
     } {}
-struct DoubleValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR DoubleValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~DoubleValueDefaultTypeInternal() {}
+struct UInt64ValueDefaultTypeInternal {
+  PROTOBUF_CONSTEXPR UInt64ValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
+  ~UInt64ValueDefaultTypeInternal() {}
   union {
-    DoubleValue _instance;
+    UInt64Value _instance;
   };
 };
 
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DoubleValueDefaultTypeInternal _DoubleValue_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UInt64ValueDefaultTypeInternal _UInt64Value_default_instance_;
         template <typename>
-PROTOBUF_CONSTEXPR FloatValue::FloatValue(::_pbi::ConstantInitialized)
+PROTOBUF_CONSTEXPR UInt32Value::UInt32Value(::_pbi::ConstantInitialized)
     : _impl_{
-      /*decltype(_impl_.value_)*/ 0,
+      /*decltype(_impl_.value_)*/ 0u,
       /*decltype(_impl_._cached_size_)*/ {},
     } {}
-struct FloatValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FloatValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FloatValueDefaultTypeInternal() {}
+struct UInt32ValueDefaultTypeInternal {
+  PROTOBUF_CONSTEXPR UInt32ValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
+  ~UInt32ValueDefaultTypeInternal() {}
   union {
-    FloatValue _instance;
+    UInt32Value _instance;
   };
 };
 
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FloatValueDefaultTypeInternal _FloatValue_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UInt32ValueDefaultTypeInternal _UInt32Value_default_instance_;
         template <typename>
-PROTOBUF_CONSTEXPR Int64Value::Int64Value(::_pbi::ConstantInitialized)
+PROTOBUF_CONSTEXPR StringValue::StringValue(::_pbi::ConstantInitialized)
     : _impl_{
-      /*decltype(_impl_.value_)*/ ::int64_t{0},
+      /*decltype(_impl_.value_)*/ {
+          &::_pbi::fixed_address_empty_string,
+          ::_pbi::ConstantInitialized{},
+      },
       /*decltype(_impl_._cached_size_)*/ {},
     } {}
-struct Int64ValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR Int64ValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~Int64ValueDefaultTypeInternal() {}
+struct StringValueDefaultTypeInternal {
+  PROTOBUF_CONSTEXPR StringValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
+  ~StringValueDefaultTypeInternal() {}
   union {
-    Int64Value _instance;
+    StringValue _instance;
   };
 };
 
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 Int64ValueDefaultTypeInternal _Int64Value_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 StringValueDefaultTypeInternal _StringValue_default_instance_;
         template <typename>
-PROTOBUF_CONSTEXPR UInt64Value::UInt64Value(::_pbi::ConstantInitialized)
+PROTOBUF_CONSTEXPR Int64Value::Int64Value(::_pbi::ConstantInitialized)
     : _impl_{
-      /*decltype(_impl_.value_)*/ ::uint64_t{0u},
+      /*decltype(_impl_.value_)*/ ::int64_t{0},
       /*decltype(_impl_._cached_size_)*/ {},
     } {}
-struct UInt64ValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UInt64ValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UInt64ValueDefaultTypeInternal() {}
+struct Int64ValueDefaultTypeInternal {
+  PROTOBUF_CONSTEXPR Int64ValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
+  ~Int64ValueDefaultTypeInternal() {}
   union {
-    UInt64Value _instance;
+    Int64Value _instance;
   };
 };
 
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UInt64ValueDefaultTypeInternal _UInt64Value_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 Int64ValueDefaultTypeInternal _Int64Value_default_instance_;
         template <typename>
 PROTOBUF_CONSTEXPR Int32Value::Int32Value(::_pbi::ConstantInitialized)
     : _impl_{
@@ -103,39 +106,39 @@ struct Int32ValueDefaultTypeInternal {
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
     PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 Int32ValueDefaultTypeInternal _Int32Value_default_instance_;
         template <typename>
-PROTOBUF_CONSTEXPR UInt32Value::UInt32Value(::_pbi::ConstantInitialized)
+PROTOBUF_CONSTEXPR FloatValue::FloatValue(::_pbi::ConstantInitialized)
     : _impl_{
-      /*decltype(_impl_.value_)*/ 0u,
+      /*decltype(_impl_.value_)*/ 0,
       /*decltype(_impl_._cached_size_)*/ {},
     } {}
-struct UInt32ValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UInt32ValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UInt32ValueDefaultTypeInternal() {}
+struct FloatValueDefaultTypeInternal {
+  PROTOBUF_CONSTEXPR FloatValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
+  ~FloatValueDefaultTypeInternal() {}
   union {
-    UInt32Value _instance;
+    FloatValue _instance;
   };
 };
 
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UInt32ValueDefaultTypeInternal _UInt32Value_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FloatValueDefaultTypeInternal _FloatValue_default_instance_;
         template <typename>
-PROTOBUF_CONSTEXPR BoolValue::BoolValue(::_pbi::ConstantInitialized)
+PROTOBUF_CONSTEXPR DoubleValue::DoubleValue(::_pbi::ConstantInitialized)
     : _impl_{
-      /*decltype(_impl_.value_)*/ false,
+      /*decltype(_impl_.value_)*/ 0,
       /*decltype(_impl_._cached_size_)*/ {},
     } {}
-struct BoolValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR BoolValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~BoolValueDefaultTypeInternal() {}
+struct DoubleValueDefaultTypeInternal {
+  PROTOBUF_CONSTEXPR DoubleValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
+  ~DoubleValueDefaultTypeInternal() {}
   union {
-    BoolValue _instance;
+    DoubleValue _instance;
   };
 };
 
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 BoolValueDefaultTypeInternal _BoolValue_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DoubleValueDefaultTypeInternal _DoubleValue_default_instance_;
         template <typename>
-PROTOBUF_CONSTEXPR StringValue::StringValue(::_pbi::ConstantInitialized)
+PROTOBUF_CONSTEXPR BytesValue::BytesValue(::_pbi::ConstantInitialized)
     : _impl_{
       /*decltype(_impl_.value_)*/ {
           &::_pbi::fixed_address_empty_string,
@@ -143,35 +146,32 @@ PROTOBUF_CONSTEXPR StringValue::StringValue(::_pbi::ConstantInitialized)
       },
       /*decltype(_impl_._cached_size_)*/ {},
     } {}
-struct StringValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR StringValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~StringValueDefaultTypeInternal() {}
+struct BytesValueDefaultTypeInternal {
+  PROTOBUF_CONSTEXPR BytesValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
+  ~BytesValueDefaultTypeInternal() {}
   union {
-    StringValue _instance;
+    BytesValue _instance;
   };
 };
 
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 StringValueDefaultTypeInternal _StringValue_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 BytesValueDefaultTypeInternal _BytesValue_default_instance_;
         template <typename>
-PROTOBUF_CONSTEXPR BytesValue::BytesValue(::_pbi::ConstantInitialized)
+PROTOBUF_CONSTEXPR BoolValue::BoolValue(::_pbi::ConstantInitialized)
     : _impl_{
-      /*decltype(_impl_.value_)*/ {
-          &::_pbi::fixed_address_empty_string,
-          ::_pbi::ConstantInitialized{},
-      },
+      /*decltype(_impl_.value_)*/ false,
       /*decltype(_impl_._cached_size_)*/ {},
     } {}
-struct BytesValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR BytesValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~BytesValueDefaultTypeInternal() {}
+struct BoolValueDefaultTypeInternal {
+  PROTOBUF_CONSTEXPR BoolValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
+  ~BoolValueDefaultTypeInternal() {}
   union {
-    BytesValue _instance;
+    BoolValue _instance;
   };
 };
 
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 BytesValueDefaultTypeInternal _BytesValue_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 BoolValueDefaultTypeInternal _BoolValue_default_instance_;
 }  // namespace protobuf
 }  // namespace google
 static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fwrappers_2eproto[9];
diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h
index f0aa906c57..1dfc2df279 100644
--- a/src/google/protobuf/wrappers.pb.h
+++ b/src/google/protobuf/wrappers.pb.h
@@ -93,25 +93,25 @@ namespace protobuf {
 
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT DoubleValue final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.DoubleValue) */ {
+class PROTOBUF_EXPORT UInt64Value final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.UInt64Value) */ {
  public:
-  inline DoubleValue() : DoubleValue(nullptr) {}
-  ~DoubleValue() override;
+  inline UInt64Value() : UInt64Value(nullptr) {}
+  ~UInt64Value() override;
   template<typename = void>
-  explicit PROTOBUF_CONSTEXPR DoubleValue(::google::protobuf::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR UInt64Value(::google::protobuf::internal::ConstantInitialized);
 
-  DoubleValue(const DoubleValue& from);
-  DoubleValue(DoubleValue&& from) noexcept
-    : DoubleValue() {
+  UInt64Value(const UInt64Value& from);
+  UInt64Value(UInt64Value&& from) noexcept
+    : UInt64Value() {
     *this = ::std::move(from);
   }
 
-  inline DoubleValue& operator=(const DoubleValue& from) {
+  inline UInt64Value& operator=(const UInt64Value& from) {
     CopyFrom(from);
     return *this;
   }
-  inline DoubleValue& operator=(DoubleValue&& from) noexcept {
+  inline UInt64Value& operator=(UInt64Value&& from) noexcept {
     if (this == &from) return *this;
     if (GetOwningArena() == from.GetOwningArena()
   #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
@@ -141,20 +141,20 @@ class PROTOBUF_EXPORT DoubleValue final :
   static const ::google::protobuf::Reflection* GetReflection() {
     return default_instance().GetMetadata().reflection;
   }
-  static const DoubleValue& default_instance() {
+  static const UInt64Value& default_instance() {
     return *internal_default_instance();
   }
-  static inline const DoubleValue* internal_default_instance() {
-    return reinterpret_cast<const DoubleValue*>(
-               &_DoubleValue_default_instance_);
+  static inline const UInt64Value* internal_default_instance() {
+    return reinterpret_cast<const UInt64Value*>(
+               &_UInt64Value_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    0;
+    3;
 
-  friend void swap(DoubleValue& a, DoubleValue& b) {
+  friend void swap(UInt64Value& a, UInt64Value& b) {
     a.Swap(&b);
   }
-  inline void Swap(DoubleValue* other) {
+  inline void Swap(UInt64Value* other) {
     if (other == this) return;
   #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetOwningArena() != nullptr &&
@@ -167,7 +167,7 @@ class PROTOBUF_EXPORT DoubleValue final :
       ::google::protobuf::internal::GenericSwap(this, other);
     }
   }
-  void UnsafeArenaSwap(DoubleValue* other) {
+  void UnsafeArenaSwap(UInt64Value* other) {
     if (other == this) return;
     ABSL_DCHECK(GetOwningArena() == other->GetOwningArena());
     InternalSwap(other);
@@ -175,14 +175,14 @@ class PROTOBUF_EXPORT DoubleValue final :
 
   // implements Message ----------------------------------------------
 
-  DoubleValue* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<DoubleValue>(arena);
+  UInt64Value* New(::google::protobuf::Arena* arena = nullptr) const final {
+    return CreateMaybeMessage<UInt64Value>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const DoubleValue& from);
+  void CopyFrom(const UInt64Value& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const DoubleValue& from) {
-    DoubleValue::MergeImpl(*this, from);
+  void MergeFrom( const UInt64Value& from) {
+    UInt64Value::MergeImpl(*this, from);
   }
   private:
   static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
@@ -200,15 +200,15 @@ class PROTOBUF_EXPORT DoubleValue final :
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void SetCachedSize(int size) const final;
-  void InternalSwap(DoubleValue* other);
+  void InternalSwap(UInt64Value* other);
 
   private:
   friend class ::google::protobuf::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "google.protobuf.DoubleValue";
+    return "google.protobuf.UInt64Value";
   }
   protected:
-  explicit DoubleValue(::google::protobuf::Arena* arena);
+  explicit UInt64Value(::google::protobuf::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -223,17 +223,17 @@ class PROTOBUF_EXPORT DoubleValue final :
   enum : int {
     kValueFieldNumber = 1,
   };
-  // double value = 1;
+  // uint64 value = 1;
   void clear_value() ;
-  double value() const;
-  void set_value(double value);
+  ::uint64_t value() const;
+  void set_value(::uint64_t value);
 
   private:
-  double _internal_value() const;
-  void _internal_set_value(double value);
+  ::uint64_t _internal_value() const;
+  void _internal_set_value(::uint64_t value);
 
   public:
-  // @@protoc_insertion_point(class_scope:google.protobuf.DoubleValue)
+  // @@protoc_insertion_point(class_scope:google.protobuf.UInt64Value)
  private:
   class _Internal;
 
@@ -246,7 +246,7 @@ class PROTOBUF_EXPORT DoubleValue final :
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
   struct Impl_ {
-    double value_;
+    ::uint64_t value_;
     mutable ::google::protobuf::internal::CachedSize _cached_size_;
     PROTOBUF_TSAN_DECLARE_MEMBER;
   };
@@ -254,25 +254,25 @@ class PROTOBUF_EXPORT DoubleValue final :
   friend struct ::TableStruct_google_2fprotobuf_2fwrappers_2eproto;
 };// -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT FloatValue final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FloatValue) */ {
+class PROTOBUF_EXPORT UInt32Value final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.UInt32Value) */ {
  public:
-  inline FloatValue() : FloatValue(nullptr) {}
-  ~FloatValue() override;
+  inline UInt32Value() : UInt32Value(nullptr) {}
+  ~UInt32Value() override;
   template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FloatValue(::google::protobuf::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR UInt32Value(::google::protobuf::internal::ConstantInitialized);
 
-  FloatValue(const FloatValue& from);
-  FloatValue(FloatValue&& from) noexcept
-    : FloatValue() {
+  UInt32Value(const UInt32Value& from);
+  UInt32Value(UInt32Value&& from) noexcept
+    : UInt32Value() {
     *this = ::std::move(from);
   }
 
-  inline FloatValue& operator=(const FloatValue& from) {
+  inline UInt32Value& operator=(const UInt32Value& from) {
     CopyFrom(from);
     return *this;
   }
-  inline FloatValue& operator=(FloatValue&& from) noexcept {
+  inline UInt32Value& operator=(UInt32Value&& from) noexcept {
     if (this == &from) return *this;
     if (GetOwningArena() == from.GetOwningArena()
   #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
@@ -302,20 +302,20 @@ class PROTOBUF_EXPORT FloatValue final :
   static const ::google::protobuf::Reflection* GetReflection() {
     return default_instance().GetMetadata().reflection;
   }
-  static const FloatValue& default_instance() {
+  static const UInt32Value& default_instance() {
     return *internal_default_instance();
   }
-  static inline const FloatValue* internal_default_instance() {
-    return reinterpret_cast<const FloatValue*>(
-               &_FloatValue_default_instance_);
+  static inline const UInt32Value* internal_default_instance() {
+    return reinterpret_cast<const UInt32Value*>(
+               &_UInt32Value_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    1;
+    5;
 
-  friend void swap(FloatValue& a, FloatValue& b) {
+  friend void swap(UInt32Value& a, UInt32Value& b) {
     a.Swap(&b);
   }
-  inline void Swap(FloatValue* other) {
+  inline void Swap(UInt32Value* other) {
     if (other == this) return;
   #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetOwningArena() != nullptr &&
@@ -328,7 +328,7 @@ class PROTOBUF_EXPORT FloatValue final :
       ::google::protobuf::internal::GenericSwap(this, other);
     }
   }
-  void UnsafeArenaSwap(FloatValue* other) {
+  void UnsafeArenaSwap(UInt32Value* other) {
     if (other == this) return;
     ABSL_DCHECK(GetOwningArena() == other->GetOwningArena());
     InternalSwap(other);
@@ -336,14 +336,14 @@ class PROTOBUF_EXPORT FloatValue final :
 
   // implements Message ----------------------------------------------
 
-  FloatValue* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FloatValue>(arena);
+  UInt32Value* New(::google::protobuf::Arena* arena = nullptr) const final {
+    return CreateMaybeMessage<UInt32Value>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FloatValue& from);
+  void CopyFrom(const UInt32Value& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FloatValue& from) {
-    FloatValue::MergeImpl(*this, from);
+  void MergeFrom( const UInt32Value& from) {
+    UInt32Value::MergeImpl(*this, from);
   }
   private:
   static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
@@ -361,15 +361,15 @@ class PROTOBUF_EXPORT FloatValue final :
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void SetCachedSize(int size) const final;
-  void InternalSwap(FloatValue* other);
+  void InternalSwap(UInt32Value* other);
 
   private:
   friend class ::google::protobuf::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "google.protobuf.FloatValue";
+    return "google.protobuf.UInt32Value";
   }
   protected:
-  explicit FloatValue(::google::protobuf::Arena* arena);
+  explicit UInt32Value(::google::protobuf::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -384,17 +384,17 @@ class PROTOBUF_EXPORT FloatValue final :
   enum : int {
     kValueFieldNumber = 1,
   };
-  // float value = 1;
+  // uint32 value = 1;
   void clear_value() ;
-  float value() const;
-  void set_value(float value);
+  ::uint32_t value() const;
+  void set_value(::uint32_t value);
 
   private:
-  float _internal_value() const;
-  void _internal_set_value(float value);
+  ::uint32_t _internal_value() const;
+  void _internal_set_value(::uint32_t value);
 
   public:
-  // @@protoc_insertion_point(class_scope:google.protobuf.FloatValue)
+  // @@protoc_insertion_point(class_scope:google.protobuf.UInt32Value)
  private:
   class _Internal;
 
@@ -407,7 +407,7 @@ class PROTOBUF_EXPORT FloatValue final :
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
   struct Impl_ {
-    float value_;
+    ::uint32_t value_;
     mutable ::google::protobuf::internal::CachedSize _cached_size_;
     PROTOBUF_TSAN_DECLARE_MEMBER;
   };
@@ -415,25 +415,25 @@ class PROTOBUF_EXPORT FloatValue final :
   friend struct ::TableStruct_google_2fprotobuf_2fwrappers_2eproto;
 };// -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Int64Value final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Int64Value) */ {
+class PROTOBUF_EXPORT StringValue final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.StringValue) */ {
  public:
-  inline Int64Value() : Int64Value(nullptr) {}
-  ~Int64Value() override;
+  inline StringValue() : StringValue(nullptr) {}
+  ~StringValue() override;
   template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Int64Value(::google::protobuf::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR StringValue(::google::protobuf::internal::ConstantInitialized);
 
-  Int64Value(const Int64Value& from);
-  Int64Value(Int64Value&& from) noexcept
-    : Int64Value() {
+  StringValue(const StringValue& from);
+  StringValue(StringValue&& from) noexcept
+    : StringValue() {
     *this = ::std::move(from);
   }
 
-  inline Int64Value& operator=(const Int64Value& from) {
+  inline StringValue& operator=(const StringValue& from) {
     CopyFrom(from);
     return *this;
   }
-  inline Int64Value& operator=(Int64Value&& from) noexcept {
+  inline StringValue& operator=(StringValue&& from) noexcept {
     if (this == &from) return *this;
     if (GetOwningArena() == from.GetOwningArena()
   #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
@@ -463,20 +463,20 @@ class PROTOBUF_EXPORT Int64Value final :
   static const ::google::protobuf::Reflection* GetReflection() {
     return default_instance().GetMetadata().reflection;
   }
-  static const Int64Value& default_instance() {
+  static const StringValue& default_instance() {
     return *internal_default_instance();
   }
-  static inline const Int64Value* internal_default_instance() {
-    return reinterpret_cast<const Int64Value*>(
-               &_Int64Value_default_instance_);
+  static inline const StringValue* internal_default_instance() {
+    return reinterpret_cast<const StringValue*>(
+               &_StringValue_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    2;
+    7;
 
-  friend void swap(Int64Value& a, Int64Value& b) {
+  friend void swap(StringValue& a, StringValue& b) {
     a.Swap(&b);
   }
-  inline void Swap(Int64Value* other) {
+  inline void Swap(StringValue* other) {
     if (other == this) return;
   #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetOwningArena() != nullptr &&
@@ -489,7 +489,7 @@ class PROTOBUF_EXPORT Int64Value final :
       ::google::protobuf::internal::GenericSwap(this, other);
     }
   }
-  void UnsafeArenaSwap(Int64Value* other) {
+  void UnsafeArenaSwap(StringValue* other) {
     if (other == this) return;
     ABSL_DCHECK(GetOwningArena() == other->GetOwningArena());
     InternalSwap(other);
@@ -497,14 +497,14 @@ class PROTOBUF_EXPORT Int64Value final :
 
   // implements Message ----------------------------------------------
 
-  Int64Value* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Int64Value>(arena);
+  StringValue* New(::google::protobuf::Arena* arena = nullptr) const final {
+    return CreateMaybeMessage<StringValue>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const Int64Value& from);
+  void CopyFrom(const StringValue& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Int64Value& from) {
-    Int64Value::MergeImpl(*this, from);
+  void MergeFrom( const StringValue& from) {
+    StringValue::MergeImpl(*this, from);
   }
   private:
   static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
@@ -522,15 +522,15 @@ class PROTOBUF_EXPORT Int64Value final :
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void SetCachedSize(int size) const final;
-  void InternalSwap(Int64Value* other);
+  void InternalSwap(StringValue* other);
 
   private:
   friend class ::google::protobuf::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "google.protobuf.Int64Value";
+    return "google.protobuf.StringValue";
   }
   protected:
-  explicit Int64Value(::google::protobuf::Arena* arena);
+  explicit StringValue(::google::protobuf::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -545,30 +545,36 @@ class PROTOBUF_EXPORT Int64Value final :
   enum : int {
     kValueFieldNumber = 1,
   };
-  // int64 value = 1;
+  // string value = 1;
   void clear_value() ;
-  ::int64_t value() const;
-  void set_value(::int64_t value);
+  const std::string& value() const;
+  template <typename Arg_ = const std::string&, typename... Args_>
+  void set_value(Arg_&& arg, Args_... args);
+  std::string* mutable_value();
+  PROTOBUF_NODISCARD std::string* release_value();
+  void set_allocated_value(std::string* ptr);
 
   private:
-  ::int64_t _internal_value() const;
-  void _internal_set_value(::int64_t value);
+  const std::string& _internal_value() const;
+  inline PROTOBUF_ALWAYS_INLINE void _internal_set_value(
+      const std::string& value);
+  std::string* _internal_mutable_value();
 
   public:
-  // @@protoc_insertion_point(class_scope:google.protobuf.Int64Value)
+  // @@protoc_insertion_point(class_scope:google.protobuf.StringValue)
  private:
   class _Internal;
 
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
       0, 1, 0,
-      0, 2>
+      41, 2>
       _table_;
   template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
   struct Impl_ {
-    ::int64_t value_;
+    ::google::protobuf::internal::ArenaStringPtr value_;
     mutable ::google::protobuf::internal::CachedSize _cached_size_;
     PROTOBUF_TSAN_DECLARE_MEMBER;
   };
@@ -576,25 +582,25 @@ class PROTOBUF_EXPORT Int64Value final :
   friend struct ::TableStruct_google_2fprotobuf_2fwrappers_2eproto;
 };// -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT UInt64Value final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.UInt64Value) */ {
+class PROTOBUF_EXPORT Int64Value final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Int64Value) */ {
  public:
-  inline UInt64Value() : UInt64Value(nullptr) {}
-  ~UInt64Value() override;
+  inline Int64Value() : Int64Value(nullptr) {}
+  ~Int64Value() override;
   template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UInt64Value(::google::protobuf::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR Int64Value(::google::protobuf::internal::ConstantInitialized);
 
-  UInt64Value(const UInt64Value& from);
-  UInt64Value(UInt64Value&& from) noexcept
-    : UInt64Value() {
+  Int64Value(const Int64Value& from);
+  Int64Value(Int64Value&& from) noexcept
+    : Int64Value() {
     *this = ::std::move(from);
   }
 
-  inline UInt64Value& operator=(const UInt64Value& from) {
+  inline Int64Value& operator=(const Int64Value& from) {
     CopyFrom(from);
     return *this;
   }
-  inline UInt64Value& operator=(UInt64Value&& from) noexcept {
+  inline Int64Value& operator=(Int64Value&& from) noexcept {
     if (this == &from) return *this;
     if (GetOwningArena() == from.GetOwningArena()
   #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
@@ -624,20 +630,20 @@ class PROTOBUF_EXPORT UInt64Value final :
   static const ::google::protobuf::Reflection* GetReflection() {
     return default_instance().GetMetadata().reflection;
   }
-  static const UInt64Value& default_instance() {
+  static const Int64Value& default_instance() {
     return *internal_default_instance();
   }
-  static inline const UInt64Value* internal_default_instance() {
-    return reinterpret_cast<const UInt64Value*>(
-               &_UInt64Value_default_instance_);
+  static inline const Int64Value* internal_default_instance() {
+    return reinterpret_cast<const Int64Value*>(
+               &_Int64Value_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    3;
+    2;
 
-  friend void swap(UInt64Value& a, UInt64Value& b) {
+  friend void swap(Int64Value& a, Int64Value& b) {
     a.Swap(&b);
   }
-  inline void Swap(UInt64Value* other) {
+  inline void Swap(Int64Value* other) {
     if (other == this) return;
   #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetOwningArena() != nullptr &&
@@ -650,7 +656,7 @@ class PROTOBUF_EXPORT UInt64Value final :
       ::google::protobuf::internal::GenericSwap(this, other);
     }
   }
-  void UnsafeArenaSwap(UInt64Value* other) {
+  void UnsafeArenaSwap(Int64Value* other) {
     if (other == this) return;
     ABSL_DCHECK(GetOwningArena() == other->GetOwningArena());
     InternalSwap(other);
@@ -658,14 +664,14 @@ class PROTOBUF_EXPORT UInt64Value final :
 
   // implements Message ----------------------------------------------
 
-  UInt64Value* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UInt64Value>(arena);
+  Int64Value* New(::google::protobuf::Arena* arena = nullptr) const final {
+    return CreateMaybeMessage<Int64Value>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UInt64Value& from);
+  void CopyFrom(const Int64Value& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UInt64Value& from) {
-    UInt64Value::MergeImpl(*this, from);
+  void MergeFrom( const Int64Value& from) {
+    Int64Value::MergeImpl(*this, from);
   }
   private:
   static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
@@ -683,15 +689,15 @@ class PROTOBUF_EXPORT UInt64Value final :
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void SetCachedSize(int size) const final;
-  void InternalSwap(UInt64Value* other);
+  void InternalSwap(Int64Value* other);
 
   private:
   friend class ::google::protobuf::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "google.protobuf.UInt64Value";
+    return "google.protobuf.Int64Value";
   }
   protected:
-  explicit UInt64Value(::google::protobuf::Arena* arena);
+  explicit Int64Value(::google::protobuf::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -706,17 +712,17 @@ class PROTOBUF_EXPORT UInt64Value final :
   enum : int {
     kValueFieldNumber = 1,
   };
-  // uint64 value = 1;
+  // int64 value = 1;
   void clear_value() ;
-  ::uint64_t value() const;
-  void set_value(::uint64_t value);
+  ::int64_t value() const;
+  void set_value(::int64_t value);
 
   private:
-  ::uint64_t _internal_value() const;
-  void _internal_set_value(::uint64_t value);
+  ::int64_t _internal_value() const;
+  void _internal_set_value(::int64_t value);
 
   public:
-  // @@protoc_insertion_point(class_scope:google.protobuf.UInt64Value)
+  // @@protoc_insertion_point(class_scope:google.protobuf.Int64Value)
  private:
   class _Internal;
 
@@ -729,7 +735,7 @@ class PROTOBUF_EXPORT UInt64Value final :
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
   struct Impl_ {
-    ::uint64_t value_;
+    ::int64_t value_;
     mutable ::google::protobuf::internal::CachedSize _cached_size_;
     PROTOBUF_TSAN_DECLARE_MEMBER;
   };
@@ -898,25 +904,25 @@ class PROTOBUF_EXPORT Int32Value final :
   friend struct ::TableStruct_google_2fprotobuf_2fwrappers_2eproto;
 };// -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT UInt32Value final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.UInt32Value) */ {
+class PROTOBUF_EXPORT FloatValue final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FloatValue) */ {
  public:
-  inline UInt32Value() : UInt32Value(nullptr) {}
-  ~UInt32Value() override;
+  inline FloatValue() : FloatValue(nullptr) {}
+  ~FloatValue() override;
   template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UInt32Value(::google::protobuf::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR FloatValue(::google::protobuf::internal::ConstantInitialized);
 
-  UInt32Value(const UInt32Value& from);
-  UInt32Value(UInt32Value&& from) noexcept
-    : UInt32Value() {
+  FloatValue(const FloatValue& from);
+  FloatValue(FloatValue&& from) noexcept
+    : FloatValue() {
     *this = ::std::move(from);
   }
 
-  inline UInt32Value& operator=(const UInt32Value& from) {
+  inline FloatValue& operator=(const FloatValue& from) {
     CopyFrom(from);
     return *this;
   }
-  inline UInt32Value& operator=(UInt32Value&& from) noexcept {
+  inline FloatValue& operator=(FloatValue&& from) noexcept {
     if (this == &from) return *this;
     if (GetOwningArena() == from.GetOwningArena()
   #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
@@ -946,20 +952,20 @@ class PROTOBUF_EXPORT UInt32Value final :
   static const ::google::protobuf::Reflection* GetReflection() {
     return default_instance().GetMetadata().reflection;
   }
-  static const UInt32Value& default_instance() {
+  static const FloatValue& default_instance() {
     return *internal_default_instance();
   }
-  static inline const UInt32Value* internal_default_instance() {
-    return reinterpret_cast<const UInt32Value*>(
-               &_UInt32Value_default_instance_);
+  static inline const FloatValue* internal_default_instance() {
+    return reinterpret_cast<const FloatValue*>(
+               &_FloatValue_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    5;
+    1;
 
-  friend void swap(UInt32Value& a, UInt32Value& b) {
+  friend void swap(FloatValue& a, FloatValue& b) {
     a.Swap(&b);
   }
-  inline void Swap(UInt32Value* other) {
+  inline void Swap(FloatValue* other) {
     if (other == this) return;
   #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetOwningArena() != nullptr &&
@@ -972,7 +978,7 @@ class PROTOBUF_EXPORT UInt32Value final :
       ::google::protobuf::internal::GenericSwap(this, other);
     }
   }
-  void UnsafeArenaSwap(UInt32Value* other) {
+  void UnsafeArenaSwap(FloatValue* other) {
     if (other == this) return;
     ABSL_DCHECK(GetOwningArena() == other->GetOwningArena());
     InternalSwap(other);
@@ -980,14 +986,14 @@ class PROTOBUF_EXPORT UInt32Value final :
 
   // implements Message ----------------------------------------------
 
-  UInt32Value* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UInt32Value>(arena);
+  FloatValue* New(::google::protobuf::Arena* arena = nullptr) const final {
+    return CreateMaybeMessage<FloatValue>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UInt32Value& from);
+  void CopyFrom(const FloatValue& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UInt32Value& from) {
-    UInt32Value::MergeImpl(*this, from);
+  void MergeFrom( const FloatValue& from) {
+    FloatValue::MergeImpl(*this, from);
   }
   private:
   static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
@@ -1005,15 +1011,15 @@ class PROTOBUF_EXPORT UInt32Value final :
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void SetCachedSize(int size) const final;
-  void InternalSwap(UInt32Value* other);
+  void InternalSwap(FloatValue* other);
 
   private:
   friend class ::google::protobuf::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "google.protobuf.UInt32Value";
+    return "google.protobuf.FloatValue";
   }
   protected:
-  explicit UInt32Value(::google::protobuf::Arena* arena);
+  explicit FloatValue(::google::protobuf::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -1028,17 +1034,17 @@ class PROTOBUF_EXPORT UInt32Value final :
   enum : int {
     kValueFieldNumber = 1,
   };
-  // uint32 value = 1;
+  // float value = 1;
   void clear_value() ;
-  ::uint32_t value() const;
-  void set_value(::uint32_t value);
+  float value() const;
+  void set_value(float value);
 
   private:
-  ::uint32_t _internal_value() const;
-  void _internal_set_value(::uint32_t value);
+  float _internal_value() const;
+  void _internal_set_value(float value);
 
   public:
-  // @@protoc_insertion_point(class_scope:google.protobuf.UInt32Value)
+  // @@protoc_insertion_point(class_scope:google.protobuf.FloatValue)
  private:
   class _Internal;
 
@@ -1051,7 +1057,7 @@ class PROTOBUF_EXPORT UInt32Value final :
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
   struct Impl_ {
-    ::uint32_t value_;
+    float value_;
     mutable ::google::protobuf::internal::CachedSize _cached_size_;
     PROTOBUF_TSAN_DECLARE_MEMBER;
   };
@@ -1059,25 +1065,25 @@ class PROTOBUF_EXPORT UInt32Value final :
   friend struct ::TableStruct_google_2fprotobuf_2fwrappers_2eproto;
 };// -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT BoolValue final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.BoolValue) */ {
+class PROTOBUF_EXPORT DoubleValue final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.DoubleValue) */ {
  public:
-  inline BoolValue() : BoolValue(nullptr) {}
-  ~BoolValue() override;
+  inline DoubleValue() : DoubleValue(nullptr) {}
+  ~DoubleValue() override;
   template<typename = void>
-  explicit PROTOBUF_CONSTEXPR BoolValue(::google::protobuf::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR DoubleValue(::google::protobuf::internal::ConstantInitialized);
 
-  BoolValue(const BoolValue& from);
-  BoolValue(BoolValue&& from) noexcept
-    : BoolValue() {
+  DoubleValue(const DoubleValue& from);
+  DoubleValue(DoubleValue&& from) noexcept
+    : DoubleValue() {
     *this = ::std::move(from);
   }
 
-  inline BoolValue& operator=(const BoolValue& from) {
+  inline DoubleValue& operator=(const DoubleValue& from) {
     CopyFrom(from);
     return *this;
   }
-  inline BoolValue& operator=(BoolValue&& from) noexcept {
+  inline DoubleValue& operator=(DoubleValue&& from) noexcept {
     if (this == &from) return *this;
     if (GetOwningArena() == from.GetOwningArena()
   #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
@@ -1107,20 +1113,20 @@ class PROTOBUF_EXPORT BoolValue final :
   static const ::google::protobuf::Reflection* GetReflection() {
     return default_instance().GetMetadata().reflection;
   }
-  static const BoolValue& default_instance() {
+  static const DoubleValue& default_instance() {
     return *internal_default_instance();
   }
-  static inline const BoolValue* internal_default_instance() {
-    return reinterpret_cast<const BoolValue*>(
-               &_BoolValue_default_instance_);
+  static inline const DoubleValue* internal_default_instance() {
+    return reinterpret_cast<const DoubleValue*>(
+               &_DoubleValue_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    6;
+    0;
 
-  friend void swap(BoolValue& a, BoolValue& b) {
+  friend void swap(DoubleValue& a, DoubleValue& b) {
     a.Swap(&b);
   }
-  inline void Swap(BoolValue* other) {
+  inline void Swap(DoubleValue* other) {
     if (other == this) return;
   #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetOwningArena() != nullptr &&
@@ -1133,7 +1139,7 @@ class PROTOBUF_EXPORT BoolValue final :
       ::google::protobuf::internal::GenericSwap(this, other);
     }
   }
-  void UnsafeArenaSwap(BoolValue* other) {
+  void UnsafeArenaSwap(DoubleValue* other) {
     if (other == this) return;
     ABSL_DCHECK(GetOwningArena() == other->GetOwningArena());
     InternalSwap(other);
@@ -1141,14 +1147,14 @@ class PROTOBUF_EXPORT BoolValue final :
 
   // implements Message ----------------------------------------------
 
-  BoolValue* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<BoolValue>(arena);
+  DoubleValue* New(::google::protobuf::Arena* arena = nullptr) const final {
+    return CreateMaybeMessage<DoubleValue>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const BoolValue& from);
+  void CopyFrom(const DoubleValue& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const BoolValue& from) {
-    BoolValue::MergeImpl(*this, from);
+  void MergeFrom( const DoubleValue& from) {
+    DoubleValue::MergeImpl(*this, from);
   }
   private:
   static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
@@ -1166,15 +1172,15 @@ class PROTOBUF_EXPORT BoolValue final :
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void SetCachedSize(int size) const final;
-  void InternalSwap(BoolValue* other);
+  void InternalSwap(DoubleValue* other);
 
   private:
   friend class ::google::protobuf::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "google.protobuf.BoolValue";
+    return "google.protobuf.DoubleValue";
   }
   protected:
-  explicit BoolValue(::google::protobuf::Arena* arena);
+  explicit DoubleValue(::google::protobuf::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -1189,17 +1195,17 @@ class PROTOBUF_EXPORT BoolValue final :
   enum : int {
     kValueFieldNumber = 1,
   };
-  // bool value = 1;
+  // double value = 1;
   void clear_value() ;
-  bool value() const;
-  void set_value(bool value);
+  double value() const;
+  void set_value(double value);
 
   private:
-  bool _internal_value() const;
-  void _internal_set_value(bool value);
+  double _internal_value() const;
+  void _internal_set_value(double value);
 
   public:
-  // @@protoc_insertion_point(class_scope:google.protobuf.BoolValue)
+  // @@protoc_insertion_point(class_scope:google.protobuf.DoubleValue)
  private:
   class _Internal;
 
@@ -1212,7 +1218,7 @@ class PROTOBUF_EXPORT BoolValue final :
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
   struct Impl_ {
-    bool value_;
+    double value_;
     mutable ::google::protobuf::internal::CachedSize _cached_size_;
     PROTOBUF_TSAN_DECLARE_MEMBER;
   };
@@ -1220,25 +1226,25 @@ class PROTOBUF_EXPORT BoolValue final :
   friend struct ::TableStruct_google_2fprotobuf_2fwrappers_2eproto;
 };// -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT StringValue final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.StringValue) */ {
+class PROTOBUF_EXPORT BytesValue final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.BytesValue) */ {
  public:
-  inline StringValue() : StringValue(nullptr) {}
-  ~StringValue() override;
+  inline BytesValue() : BytesValue(nullptr) {}
+  ~BytesValue() override;
   template<typename = void>
-  explicit PROTOBUF_CONSTEXPR StringValue(::google::protobuf::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR BytesValue(::google::protobuf::internal::ConstantInitialized);
 
-  StringValue(const StringValue& from);
-  StringValue(StringValue&& from) noexcept
-    : StringValue() {
+  BytesValue(const BytesValue& from);
+  BytesValue(BytesValue&& from) noexcept
+    : BytesValue() {
     *this = ::std::move(from);
   }
 
-  inline StringValue& operator=(const StringValue& from) {
+  inline BytesValue& operator=(const BytesValue& from) {
     CopyFrom(from);
     return *this;
   }
-  inline StringValue& operator=(StringValue&& from) noexcept {
+  inline BytesValue& operator=(BytesValue&& from) noexcept {
     if (this == &from) return *this;
     if (GetOwningArena() == from.GetOwningArena()
   #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
@@ -1268,20 +1274,20 @@ class PROTOBUF_EXPORT StringValue final :
   static const ::google::protobuf::Reflection* GetReflection() {
     return default_instance().GetMetadata().reflection;
   }
-  static const StringValue& default_instance() {
+  static const BytesValue& default_instance() {
     return *internal_default_instance();
   }
-  static inline const StringValue* internal_default_instance() {
-    return reinterpret_cast<const StringValue*>(
-               &_StringValue_default_instance_);
+  static inline const BytesValue* internal_default_instance() {
+    return reinterpret_cast<const BytesValue*>(
+               &_BytesValue_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    7;
+    8;
 
-  friend void swap(StringValue& a, StringValue& b) {
+  friend void swap(BytesValue& a, BytesValue& b) {
     a.Swap(&b);
   }
-  inline void Swap(StringValue* other) {
+  inline void Swap(BytesValue* other) {
     if (other == this) return;
   #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetOwningArena() != nullptr &&
@@ -1294,7 +1300,7 @@ class PROTOBUF_EXPORT StringValue final :
       ::google::protobuf::internal::GenericSwap(this, other);
     }
   }
-  void UnsafeArenaSwap(StringValue* other) {
+  void UnsafeArenaSwap(BytesValue* other) {
     if (other == this) return;
     ABSL_DCHECK(GetOwningArena() == other->GetOwningArena());
     InternalSwap(other);
@@ -1302,14 +1308,14 @@ class PROTOBUF_EXPORT StringValue final :
 
   // implements Message ----------------------------------------------
 
-  StringValue* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<StringValue>(arena);
+  BytesValue* New(::google::protobuf::Arena* arena = nullptr) const final {
+    return CreateMaybeMessage<BytesValue>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const StringValue& from);
+  void CopyFrom(const BytesValue& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const StringValue& from) {
-    StringValue::MergeImpl(*this, from);
+  void MergeFrom( const BytesValue& from) {
+    BytesValue::MergeImpl(*this, from);
   }
   private:
   static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
@@ -1327,15 +1333,15 @@ class PROTOBUF_EXPORT StringValue final :
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void SetCachedSize(int size) const final;
-  void InternalSwap(StringValue* other);
+  void InternalSwap(BytesValue* other);
 
   private:
   friend class ::google::protobuf::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "google.protobuf.StringValue";
+    return "google.protobuf.BytesValue";
   }
   protected:
-  explicit StringValue(::google::protobuf::Arena* arena);
+  explicit BytesValue(::google::protobuf::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -1350,7 +1356,7 @@ class PROTOBUF_EXPORT StringValue final :
   enum : int {
     kValueFieldNumber = 1,
   };
-  // string value = 1;
+  // bytes value = 1;
   void clear_value() ;
   const std::string& value() const;
   template <typename Arg_ = const std::string&, typename... Args_>
@@ -1366,14 +1372,14 @@ class PROTOBUF_EXPORT StringValue final :
   std::string* _internal_mutable_value();
 
   public:
-  // @@protoc_insertion_point(class_scope:google.protobuf.StringValue)
+  // @@protoc_insertion_point(class_scope:google.protobuf.BytesValue)
  private:
   class _Internal;
 
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
       0, 1, 0,
-      41, 2>
+      0, 2>
       _table_;
   template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
@@ -1387,25 +1393,25 @@ class PROTOBUF_EXPORT StringValue final :
   friend struct ::TableStruct_google_2fprotobuf_2fwrappers_2eproto;
 };// -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT BytesValue final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.BytesValue) */ {
+class PROTOBUF_EXPORT BoolValue final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.BoolValue) */ {
  public:
-  inline BytesValue() : BytesValue(nullptr) {}
-  ~BytesValue() override;
+  inline BoolValue() : BoolValue(nullptr) {}
+  ~BoolValue() override;
   template<typename = void>
-  explicit PROTOBUF_CONSTEXPR BytesValue(::google::protobuf::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR BoolValue(::google::protobuf::internal::ConstantInitialized);
 
-  BytesValue(const BytesValue& from);
-  BytesValue(BytesValue&& from) noexcept
-    : BytesValue() {
+  BoolValue(const BoolValue& from);
+  BoolValue(BoolValue&& from) noexcept
+    : BoolValue() {
     *this = ::std::move(from);
   }
 
-  inline BytesValue& operator=(const BytesValue& from) {
+  inline BoolValue& operator=(const BoolValue& from) {
     CopyFrom(from);
     return *this;
   }
-  inline BytesValue& operator=(BytesValue&& from) noexcept {
+  inline BoolValue& operator=(BoolValue&& from) noexcept {
     if (this == &from) return *this;
     if (GetOwningArena() == from.GetOwningArena()
   #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
@@ -1435,20 +1441,20 @@ class PROTOBUF_EXPORT BytesValue final :
   static const ::google::protobuf::Reflection* GetReflection() {
     return default_instance().GetMetadata().reflection;
   }
-  static const BytesValue& default_instance() {
+  static const BoolValue& default_instance() {
     return *internal_default_instance();
   }
-  static inline const BytesValue* internal_default_instance() {
-    return reinterpret_cast<const BytesValue*>(
-               &_BytesValue_default_instance_);
+  static inline const BoolValue* internal_default_instance() {
+    return reinterpret_cast<const BoolValue*>(
+               &_BoolValue_default_instance_);
   }
   static constexpr int kIndexInFileMessages =
-    8;
+    6;
 
-  friend void swap(BytesValue& a, BytesValue& b) {
+  friend void swap(BoolValue& a, BoolValue& b) {
     a.Swap(&b);
   }
-  inline void Swap(BytesValue* other) {
+  inline void Swap(BoolValue* other) {
     if (other == this) return;
   #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetOwningArena() != nullptr &&
@@ -1461,7 +1467,7 @@ class PROTOBUF_EXPORT BytesValue final :
       ::google::protobuf::internal::GenericSwap(this, other);
     }
   }
-  void UnsafeArenaSwap(BytesValue* other) {
+  void UnsafeArenaSwap(BoolValue* other) {
     if (other == this) return;
     ABSL_DCHECK(GetOwningArena() == other->GetOwningArena());
     InternalSwap(other);
@@ -1469,14 +1475,14 @@ class PROTOBUF_EXPORT BytesValue final :
 
   // implements Message ----------------------------------------------
 
-  BytesValue* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<BytesValue>(arena);
+  BoolValue* New(::google::protobuf::Arena* arena = nullptr) const final {
+    return CreateMaybeMessage<BoolValue>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const BytesValue& from);
+  void CopyFrom(const BoolValue& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const BytesValue& from) {
-    BytesValue::MergeImpl(*this, from);
+  void MergeFrom( const BoolValue& from) {
+    BoolValue::MergeImpl(*this, from);
   }
   private:
   static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
@@ -1494,15 +1500,15 @@ class PROTOBUF_EXPORT BytesValue final :
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void SetCachedSize(int size) const final;
-  void InternalSwap(BytesValue* other);
+  void InternalSwap(BoolValue* other);
 
   private:
   friend class ::google::protobuf::internal::AnyMetadata;
   static ::absl::string_view FullMessageName() {
-    return "google.protobuf.BytesValue";
+    return "google.protobuf.BoolValue";
   }
   protected:
-  explicit BytesValue(::google::protobuf::Arena* arena);
+  explicit BoolValue(::google::protobuf::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -1517,23 +1523,17 @@ class PROTOBUF_EXPORT BytesValue final :
   enum : int {
     kValueFieldNumber = 1,
   };
-  // bytes value = 1;
+  // bool value = 1;
   void clear_value() ;
-  const std::string& value() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_value(Arg_&& arg, Args_... args);
-  std::string* mutable_value();
-  PROTOBUF_NODISCARD std::string* release_value();
-  void set_allocated_value(std::string* ptr);
+  bool value() const;
+  void set_value(bool value);
 
   private:
-  const std::string& _internal_value() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_value(
-      const std::string& value);
-  std::string* _internal_mutable_value();
+  bool _internal_value() const;
+  void _internal_set_value(bool value);
 
   public:
-  // @@protoc_insertion_point(class_scope:google.protobuf.BytesValue)
+  // @@protoc_insertion_point(class_scope:google.protobuf.BoolValue)
  private:
   class _Internal;
 
@@ -1546,7 +1546,7 @@ class PROTOBUF_EXPORT BytesValue final :
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
   struct Impl_ {
-    ::google::protobuf::internal::ArenaStringPtr value_;
+    bool value_;
     mutable ::google::protobuf::internal::CachedSize _cached_size_;
     PROTOBUF_TSAN_DECLARE_MEMBER;
   };